Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
googletest
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
googletest
Commits
fab22526
Commit
fab22526
authored
Aug 29, 2018
by
Gennadiy Civil
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changing clang tp 3.9 as 3.7 no longer works on Travis
parent
3d561218
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
env-linux.sh
ci/env-linux.sh
+1
-1
env-osx.sh
ci/env-osx.sh
+1
-1
install-linux.sh
ci/install-linux.sh
+1
-1
No files found.
ci/env-linux.sh
View file @
fab22526
...
@@ -37,5 +37,5 @@
...
@@ -37,5 +37,5 @@
if
[
"
${
TRAVIS_OS_NAME
}
"
=
"linux"
]
;
then
if
[
"
${
TRAVIS_OS_NAME
}
"
=
"linux"
]
;
then
if
[
"
$CXX
"
=
"g++"
]
;
then
export
CXX
=
"g++-4.9"
CC
=
"gcc-4.9"
;
fi
if
[
"
$CXX
"
=
"g++"
]
;
then
export
CXX
=
"g++-4.9"
CC
=
"gcc-4.9"
;
fi
if
[
"
$CXX
"
=
"clang++"
]
;
then
export
CXX
=
"clang++-3.
7"
CC
=
"clang-3.7
"
;
fi
if
[
"
$CXX
"
=
"clang++"
]
;
then
export
CXX
=
"clang++-3.
9"
CC
=
"clang-3.9
"
;
fi
fi
fi
ci/env-osx.sh
View file @
fab22526
...
@@ -36,5 +36,5 @@
...
@@ -36,5 +36,5 @@
# TODO() - we can check if this is being sourced using $BASH_VERSION and $BASH_SOURCE[0] != ${0}.
# TODO() - we can check if this is being sourced using $BASH_VERSION and $BASH_SOURCE[0] != ${0}.
if
[
"
${
TRAVIS_OS_NAME
}
"
=
"linux"
]
;
then
if
[
"
${
TRAVIS_OS_NAME
}
"
=
"linux"
]
;
then
if
[
"
$CXX
"
=
"clang++"
]
;
then
export
CXX
=
"clang++-3.
7"
CC
=
"clang-3.7
"
;
fi
if
[
"
$CXX
"
=
"clang++"
]
;
then
export
CXX
=
"clang++-3.
9"
CC
=
"clang-3.9
"
;
fi
fi
fi
ci/install-linux.sh
View file @
fab22526
...
@@ -41,7 +41,7 @@ if [ "${TRAVIS_SUDO}" = "true" ]; then
...
@@ -41,7 +41,7 @@ if [ "${TRAVIS_SUDO}" = "true" ]; then
echo
"deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8"
|
\
echo
"deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8"
|
\
sudo tee
/etc/apt/sources.list.d/bazel.list
sudo tee
/etc/apt/sources.list.d/bazel.list
curl https://bazel.build/bazel-release.pub.gpg |
sudo
apt-key add -
curl https://bazel.build/bazel-release.pub.gpg |
sudo
apt-key add -
sudo
apt-get update
&&
sudo
apt-get
install
-y
bazel gcc-4.9 g++-4.9 clang-3.
7
sudo
apt-get update
&&
sudo
apt-get
install
-y
bazel gcc-4.9 g++-4.9 clang-3.
9
elif
[
"
${
CXX
}
"
=
"clang++"
]
;
then
elif
[
"
${
CXX
}
"
=
"clang++"
]
;
then
# Use ccache, assuming $HOME/bin is in the path, which is true in the Travis build environment.
# Use ccache, assuming $HOME/bin is in the path, which is true in the Travis build environment.
ln
-sf
/usr/bin/ccache
$HOME
/bin/
${
CXX
}
;
ln
-sf
/usr/bin/ccache
$HOME
/bin/
${
CXX
}
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment