diff options
| author | dmauro <dmauro@google.com> | 2020-05-28 19:37:07 (GMT) |
|---|---|---|
| committer | Derek Mauro <dmauro@google.com> | 2020-05-28 23:55:32 (GMT) |
| commit | 859bfe8981d6724c4ea06e73d29accd8588f3230 (patch) | |
| tree | b68d5c9b26d7f2ca3bd6a89ebc3982947db2a346 | |
| parent | fd32ba66e2408f2599f9b03a9b2b1ef2c272b7e3 (diff) | |
| download | googletest-859bfe8981d6724c4ea06e73d29accd8588f3230.zip googletest-859bfe8981d6724c4ea06e73d29accd8588f3230.tar.gz googletest-859bfe8981d6724c4ea06e73d29accd8588f3230.tar.bz2 | |
Googletest export
Update Travis CI to use Ubuntu Bionic in some cases
PiperOrigin-RevId: 313639562
| -rw-r--r-- | .travis.yml | 17 | ||||
| -rwxr-xr-x | ci/build-linux-bazel.sh | 1 | ||||
| -rwxr-xr-x | ci/env-linux.sh | 4 | ||||
| -rwxr-xr-x | ci/install-linux.sh | 2 |
4 files changed, 9 insertions, 15 deletions
diff --git a/.travis.yml b/.travis.yml index 930f994..d7b23b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,19 +14,21 @@ matrix: install: ./ci/install-platformio.sh script: ./ci/build-platformio.sh - os: linux - dist: xenial + dist: bionic compiler: gcc install: ./ci/install-linux.sh && ./ci/log-config.sh script: ./ci/build-linux-bazel.sh - os: linux - dist: xenial + dist: bionic compiler: clang install: ./ci/install-linux.sh && ./ci/log-config.sh script: ./ci/build-linux-bazel.sh - os: linux + dist: bionic compiler: gcc env: BUILD_TYPE=Debug VERBOSE=1 CXX_FLAGS="-std=c++11 -Wdeprecated" - os: linux + dist: bionic compiler: clang env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS="-std=c++11 -Wdeprecated" NO_EXCEPTION=ON NO_RTTI=ON COMPILER_IS_GNUCXX=ON - os: osx @@ -48,16 +50,9 @@ script: ./ci/travis.sh # This section installs the necessary dependencies. addons: apt: - # List of whitelisted in travis packages for ubuntu-precise can be found here: - # https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise - # List of whitelisted in travis apt-sources: - # https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.9 packages: - - g++-4.9 - - clang-3.9 + - g++ + - clang update: true homebrew: packages: diff --git a/ci/build-linux-bazel.sh b/ci/build-linux-bazel.sh index ae8fb75..cfb06a9 100755 --- a/ci/build-linux-bazel.sh +++ b/ci/build-linux-bazel.sh @@ -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 diff --git a/ci/env-linux.sh b/ci/env-linux.sh index 37800d6..7d2b8a8 100755 --- a/ci/env-linux.sh +++ b/ci/env-linux.sh @@ -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 diff --git a/ci/install-linux.sh b/ci/install-linux.sh index 05e2cb2..f98ac7d 100755 --- a/ci/install-linux.sh +++ b/ci/install-linux.sh @@ -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}; |