From 83328b234e30d38a1ecc60191c40cf5497343673 Mon Sep 17 00:00:00 2001
From: Gennadiy Civil <misterg@google.com>
Date: Mon, 17 Jun 2019 15:03:27 -0400
Subject: [PATCH 1/2] Revert "testing, explicitly specify compiler"
This reverts commit 6c971ca9a34b3eb82180732db807da74ea71cf79.
From a60451ed9438bb8bad2f09ece43c79aaa4ad4fe7 Mon Sep 17 00:00:00 2001
From: Gennadiy Civil <misterg@google.com>
Date: Mon, 17 Jun 2019 16:57:54 -0400
Subject: [PATCH 2/2] Fixing CI break by going to bazel 0.26.1
---
ci/install-linux.sh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
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};