aboutsummaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authormisterg <misterg@google.com>2019-06-18 14:21:57 -0400
committerGennadiy Civil <misterg@google.com>2019-06-18 14:25:41 -0400
commit1d721a7a9d58748b3f687b7ef56e9159881041df (patch)
tree3aae178be30b3dfac758df577b2a7b23847447f0 /ci
parentee32b72e12048c14868012a8f339202f82f1ef7d (diff)
downloadgoogletest-1d721a7a9d58748b3f687b7ef56e9159881041df.tar.gz
googletest-1d721a7a9d58748b3f687b7ef56e9159881041df.tar.bz2
googletest-1d721a7a9d58748b3f687b7ef56e9159881041df.zip
Googletest export
Move Googletest OSS bazel builds to latest bazel. The latest bazel ( 0.27.0 as of now ) does not run on trusty. PiperOrigin-RevId: 253829774
Diffstat (limited to 'ci')
-rwxr-xr-xci/install-linux.sh5
1 files changed, 1 insertions, 4 deletions
diff --git a/ci/install-linux.sh b/ci/install-linux.sh
index a4caf440..05e2cb28 100755
--- a/ci/install-linux.sh
+++ b/ci/install-linux.sh
@@ -41,10 +41,7 @@ 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 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
+ sudo apt-get update && sudo apt-get install -y bazel gcc-4.9 g++-4.9 clang-3.9
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};