Googletest export

Update Travis CI to use Ubuntu Bionic in some cases

PiperOrigin-RevId: 313639562
This commit is contained in:
dmauro
2020-05-28 15:37:07 -04:00
committed by Derek Mauro
parent fd32ba66e2
commit 859bfe8981
4 changed files with 9 additions and 15 deletions

View File

@@ -32,6 +32,5 @@
set -e
bazel version
bazel build --curses=no //...:all
bazel test --curses=no //...:all
bazel test --curses=no //...:all --define absl=1

View File

@@ -36,6 +36,6 @@
# TODO() - we can check if this is being sourced using $BASH_VERSION and $BASH_SOURCE[0] != ${0}.
if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.9" CC="clang-3.9"; fi
if [ "$CXX" = "g++" ]; then export CXX="g++" CC="gcc"; fi
if [ "$CXX" = "clang++" ]; then export CXX="clang++" CC="clang"; fi
fi

View File

@@ -41,7 +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 bazel gcc-4.9 g++-4.9 clang-3.9
sudo apt-get update && sudo apt-get install -y bazel gcc g++ clang
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};