Merge pull request #2290 from gennadiycivil:master

PiperOrigin-RevId: 253660961
This commit is contained in:
Gennadiy Civil 2019-06-18 10:37:09 -04:00
commit 4f0160360c

View File

@ -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};