aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2019-06-18 10:37:09 -0400
committerGennadiy Civil <misterg@google.com>2019-06-18 10:37:09 -0400
commit4f0160360cf1d4e6890c80b4d7c336532b3a9933 (patch)
treecaa7e24554b30b64a77c5c2c55b3004593d34ee1
parentbe8d0146252f049eaa96c730c3c3a571f212beb2 (diff)
parent60b9298653c03728625f51dc4851d4cb986483b3 (diff)
downloadgoogletest-4f0160360cf1d4e6890c80b4d7c336532b3a9933.tar.gz
googletest-4f0160360cf1d4e6890c80b4d7c336532b3a9933.tar.bz2
googletest-4f0160360cf1d4e6890c80b4d7c336532b3a9933.zip
Merge pull request #2290 from gennadiycivil:master
PiperOrigin-RevId: 253660961
-rwxr-xr-xci/install-linux.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/ci/install-linux.sh b/ci/install-linux.sh
index 05e2cb28..a4caf440 100755
--- a/ci/install-linux.sh
+++ b/ci/install-linux.sh
@@ -41,7 +41,10 @@ if [ "${TRAVIS_SUDO}" = "true" ]; then
echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" | \
sudo tee /etc/apt/sources.list.d/bazel.list
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.9
+ sudo apt-get update && sudo apt-get install -y gcc-4.9 g++-4.9 clang-3.9
+ sudo wget https://github.com/bazelbuild/bazel/releases/download/0.26.1/bazel-0.26.1-installer-linux-x86_64.sh
+ sudo chmod +x bazel-0.26.1-installer-linux-x86_64.sh
+ sudo ./bazel-0.26.1-installer-linux-x86_64.sh
elif [ "${CXX}" = "clang++" ]; then
# 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};