diff options
| author | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2020-07-03 19:14:25 +0300 |
|---|---|---|
| committer | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2020-07-03 19:14:25 +0300 |
| commit | 89f9dddd3e44a53317edb9a54883c85d47488b5b (patch) | |
| tree | 9d7e6b28471757fb2e090c81cac6f74853efb16f | |
| parent | b97c7eb5a36a7c96f10c0dc7d3ee81629b5f9876 (diff) | |
Try travis with GCC 9.
| -rw-r--r-- | .travis.yml | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/.travis.yml b/.travis.yml index 34ab1a1c..1ec16e0e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,10 +13,9 @@ notifications: addons: apt: -# sources: -# - sourceline: "ppa:ubuntu-toolchain-r/test" + sources: + - sourceline: "ppa:ubuntu-toolchain-r/test" packages: - - g++-8 - clang - g++-arm-linux-gnueabihf - python3 @@ -35,8 +34,8 @@ env: matrix: include: - - name: "g++ 8.4 x64 cmake tests (error_code)" - compiler: g++-8 + - name: "g++ 9.3 x64 cmake tests (error_code)" + compiler: g++-9 os: linux env: NAME=x64_EC_tests - name: "clang++ 7.0 x64 cmake tests (error_code)" @@ -54,8 +53,8 @@ matrix: os: osx osx_image: xcode11.6 env: NAME=x64_EC_tests - - name: "g++ 8.4 x64 cmake tests (status_code)" - compiler: g++-8 + - name: "g++ 9.3 x64 cmake tests (status_code)" + compiler: g++-9 os: linux env: - NAME=x64_SC_tests @@ -80,11 +79,11 @@ matrix: # - NAME=x64_SC_tests # - CMAKE_CONFIGURE_OPTIONS=-DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON - name: "g++ ARM32 cmake build (error_code)" - compiler: g++-8 + compiler: g++-9 os: linux env: NAME=ARM32_EC_build - name: "g++ ARM32 cmake build (status_code)" - compiler: g++-8 + compiler: g++-9 os: linux env: - NAME=ARM32_SC_build @@ -93,8 +92,8 @@ matrix: compiler: clang++ os: linux env: NAME=Documentation - - name: "g++ 8.4 x64 Programs (error_code)" - compiler: g++-8 + - name: "g++ 9.3 x64 Programs (error_code)" + compiler: g++-9 os: linux env: NAME=x64_EC_programs - name: "clang++ 7.0 x64 Programs (error_code)" @@ -120,8 +119,8 @@ matrix: # env: # - NAME=x64_SC_programs # - CMAKE_CONFIGURE_OPTIONS=-DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON - - name: "g++ 8.4 Installability (error_code)" - compiler: g++-8 + - name: "g++ 9.3 Installability (error_code)" + compiler: g++-9 os: linux env: NAME=x64_EC_install - name: "clang++ 7.0 Installability (error_code)" @@ -139,8 +138,8 @@ matrix: os: osx osx_image: xcode11.6 env: NAME=x64_EC_install - - name: "g++ 8.4 Installability (status_code)" - compiler: g++-8 + - name: "g++ 9.3 Installability (status_code)" + compiler: g++-9 os: linux env: - NAME=x64_SC_install @@ -166,6 +165,10 @@ matrix: # - CMAKE_CONFIGURE_OPTIONS=-DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON before_install: + - if [ "$TRAVIS_COMPILER" = "g++-9" ]; then + sudo apt update; + sudo apt install g++-9; + fi - if [ "$TRAVIS_COMPILER" = "clang++-10" ]; then wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -; echo "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main" >> /etc/apt/sources.list; @@ -233,7 +236,7 @@ script: after_success: # - bash -x ./update_coveralls.sh `pwd` # - NEWNAME=llfio-v2.0-binaries-linux64-$(date +%Y%m%d%H%M%S).tgz - - if [ "$NAME" = "linux_g++_x64_EC_tests" ]; then + - if [ "$NAME" = "linux_g++-9_x64_EC_tests" ]; then NEWNAME=llfio-v2.0-binaries-linux64-$TRAVIS_COMMIT.tgz; mv llfio-v2.0-binaries-linux-x64.tgz $NEWNAME; curl -T $NEWNAME -u jenkins-nedprod:$JENKINS_NEDPROD_PASSWORD https://dedi5.nedprod.com/static/files/upload/; |