Googletest export
Update Travis CI to use Ubuntu Bionic in some cases PiperOrigin-RevId: 313639562
This commit is contained in:
		
							
								
								
									
										17
									
								
								.travis.yml
									
									
									
									
									
								
							
							
						
						
									
										17
									
								
								.travis.yml
									
									
									
									
									
								
							@@ -14,19 +14,21 @@ matrix:
 | 
				
			|||||||
      install: ./ci/install-platformio.sh
 | 
					      install: ./ci/install-platformio.sh
 | 
				
			||||||
      script: ./ci/build-platformio.sh
 | 
					      script: ./ci/build-platformio.sh
 | 
				
			||||||
    - os: linux
 | 
					    - os: linux
 | 
				
			||||||
      dist: xenial
 | 
					      dist: bionic
 | 
				
			||||||
      compiler: gcc
 | 
					      compiler: gcc
 | 
				
			||||||
      install: ./ci/install-linux.sh && ./ci/log-config.sh
 | 
					      install: ./ci/install-linux.sh && ./ci/log-config.sh
 | 
				
			||||||
      script: ./ci/build-linux-bazel.sh
 | 
					      script: ./ci/build-linux-bazel.sh
 | 
				
			||||||
    - os: linux
 | 
					    - os: linux
 | 
				
			||||||
      dist: xenial
 | 
					      dist: bionic
 | 
				
			||||||
      compiler: clang
 | 
					      compiler: clang
 | 
				
			||||||
      install: ./ci/install-linux.sh && ./ci/log-config.sh
 | 
					      install: ./ci/install-linux.sh && ./ci/log-config.sh
 | 
				
			||||||
      script: ./ci/build-linux-bazel.sh
 | 
					      script: ./ci/build-linux-bazel.sh
 | 
				
			||||||
    - os: linux
 | 
					    - os: linux
 | 
				
			||||||
 | 
					      dist: bionic
 | 
				
			||||||
      compiler: gcc
 | 
					      compiler: gcc
 | 
				
			||||||
      env: BUILD_TYPE=Debug VERBOSE=1 CXX_FLAGS="-std=c++11 -Wdeprecated"
 | 
					      env: BUILD_TYPE=Debug VERBOSE=1 CXX_FLAGS="-std=c++11 -Wdeprecated"
 | 
				
			||||||
    - os: linux
 | 
					    - os: linux
 | 
				
			||||||
 | 
					      dist: bionic
 | 
				
			||||||
      compiler: clang
 | 
					      compiler: clang
 | 
				
			||||||
      env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS="-std=c++11 -Wdeprecated" NO_EXCEPTION=ON NO_RTTI=ON COMPILER_IS_GNUCXX=ON
 | 
					      env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS="-std=c++11 -Wdeprecated" NO_EXCEPTION=ON NO_RTTI=ON COMPILER_IS_GNUCXX=ON
 | 
				
			||||||
    - os: osx
 | 
					    - os: osx
 | 
				
			||||||
@@ -48,16 +50,9 @@ script: ./ci/travis.sh
 | 
				
			|||||||
# This section installs the necessary dependencies.
 | 
					# This section installs the necessary dependencies.
 | 
				
			||||||
addons:
 | 
					addons:
 | 
				
			||||||
  apt:
 | 
					  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:
 | 
					    packages:
 | 
				
			||||||
    - g++-4.9
 | 
					    - g++
 | 
				
			||||||
    - clang-3.9
 | 
					    - clang
 | 
				
			||||||
    update: true
 | 
					    update: true
 | 
				
			||||||
  homebrew:
 | 
					  homebrew:
 | 
				
			||||||
    packages:
 | 
					    packages:
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -32,6 +32,5 @@
 | 
				
			|||||||
set -e
 | 
					set -e
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bazel version
 | 
					bazel version
 | 
				
			||||||
bazel build --curses=no //...:all
 | 
					 | 
				
			||||||
bazel test --curses=no //...:all
 | 
					bazel test --curses=no //...:all
 | 
				
			||||||
bazel test --curses=no //...:all --define absl=1
 | 
					bazel test --curses=no //...:all --define absl=1
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -36,6 +36,6 @@
 | 
				
			|||||||
# TODO() - we can check if this is being sourced using $BASH_VERSION and $BASH_SOURCE[0] != ${0}.
 | 
					# TODO() - we can check if this is being sourced using $BASH_VERSION and $BASH_SOURCE[0] != ${0}.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
 | 
					if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
 | 
				
			||||||
    if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
 | 
					    if [ "$CXX" = "g++" ]; then export CXX="g++" CC="gcc"; fi
 | 
				
			||||||
    if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.9" CC="clang-3.9"; fi
 | 
					    if [ "$CXX" = "clang++" ]; then export CXX="clang++" CC="clang"; fi
 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -41,7 +41,7 @@ if [ "${TRAVIS_SUDO}" = "true" ]; then
 | 
				
			|||||||
    echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" | \
 | 
					    echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" | \
 | 
				
			||||||
        sudo tee /etc/apt/sources.list.d/bazel.list
 | 
					        sudo tee /etc/apt/sources.list.d/bazel.list
 | 
				
			||||||
    curl https://bazel.build/bazel-release.pub.gpg | sudo apt-key add -
 | 
					    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
 | 
					elif [ "${CXX}" = "clang++" ]; then
 | 
				
			||||||
    # Use ccache, assuming $HOME/bin is in the path, which is true in the Travis build environment.
 | 
					    # 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};
 | 
					    ln -sf /usr/bin/ccache $HOME/bin/${CXX};
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user