Skip to content
Permalink
Browse files

travis: actually use updated compiler versions

For the Linux builds, GCC 8 and 7 and clang 7 were installed, but the
new GCC versions were only used for the coverage build and for building
nghttp2, while the new clang version was not used at all.

BoringSSL needs to use the default GCC as it respects CC, but not CXX,
so it would otherwise pass gcc 8 options to g++ 4.8 and fail.

Also remove GCC 7, it's not needed anymore.

Ref: https://docs.travis-ci.com/user/languages/c/#c11c11-and-beyond-and-toolchain-versioning

Closes #3670
  • Loading branch information...
MarcelRaad committed Mar 9, 2019
1 parent 3ee07e3 commit 8bd397de1d7d1382b699f2a6805070bf359fb229
Showing with 79 additions and 29 deletions.
  1. +79 −29 .travis.yml
@@ -22,7 +22,6 @@ addons:
- llvm-toolchain-trusty-7 - llvm-toolchain-trusty-7
packages: packages:
- cmake - cmake
- gcc-7
- gcc-8 - gcc-8
- lcov - lcov
- clang-7 - clang-7
@@ -48,67 +47,99 @@ matrix:
- os: linux - os: linux
compiler: gcc compiler: gcc
dist: trusty dist: trusty
env: T=normal C="--with-gssapi --with-libssh2" CHECKSRC=1 env:
- T=normal C="--with-gssapi --with-libssh2" CHECKSRC=1
- OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
- os: linux - os: linux
compiler: gcc compiler: gcc
dist: trusty dist: trusty
env: T=normal C=--with-libssh env:
- T=normal C=--with-libssh
- OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
- os: linux - os: linux
compiler: gcc compiler: gcc
dist: trusty dist: trusty
env: T=normal C="--disable-http --disable-smtp --disable-imap" env:
- T=normal C="--disable-http --disable-smtp --disable-imap"
- OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
- os: linux - os: linux
compiler: gcc compiler: gcc
dist: trusty dist: trusty
env: T=normal C="--enable-ares" env:
- T=normal C="--enable-ares"
- OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
- os: linux - os: linux
compiler: gcc compiler: gcc
dist: trusty dist: trusty
env: T=normal C="--disable-verbose" CPPFLAGS="-Wno-variadic-macros" NOTESTS=1 env:
- T=normal C="--disable-verbose" CPPFLAGS="-Wno-variadic-macros" NOTESTS=1
- OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
- os: linux - os: linux
compiler: gcc compiler: gcc
dist: trusty dist: trusty
env: T=normal BROTLI=yes env:
- T=normal BROTLI=yes
- OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
- os: linux - os: linux
compiler: gcc compiler: gcc
dist: trusty dist: trusty
env: T=novalgrind BORINGSSL=yes C="--with-ssl=$HOME/boringssl" LD_LIBRARY_PATH=/home/travis/boringssl/lib:/usr/local/lib env:
- T=novalgrind BORINGSSL=yes C="--with-ssl=$HOME/boringssl" LD_LIBRARY_PATH=/home/travis/boringssl/lib:/usr/local/lib
- OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
- os: linux - os: linux
compiler: gcc compiler: gcc
dist: trusty dist: trusty
env: T=debug-wolfssl C="--with-wolfssl --without-ssl" env:
- T=debug-wolfssl C="--with-wolfssl --without-ssl"
- OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
- os: linux - os: linux
compiler: gcc compiler: gcc
dist: trusty dist: trusty
env: T=debug-mesalink C="--with-mesalink --without-ssl" env:
- T=debug-mesalink C="--with-mesalink --without-ssl"
- OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
- os: linux - os: linux
compiler: clang compiler: clang
dist: trusty dist: trusty
env: T=debug env:
- T=debug
- OVERRIDE_CC="CC=clang-7" OVERRIDE_CXX="CXX=clang++-7"
- os: linux - os: linux
compiler: clang compiler: clang
dist: trusty dist: trusty
env: T=debug C="--enable-alt-svc" env:
- T=debug C="--enable-alt-svc"
- OVERRIDE_CC="CC=clang-7" OVERRIDE_CXX="CXX=clang++-7"
- os: linux - os: linux
compiler: clang compiler: clang
dist: trusty dist: trusty
env: T=debug C="--with-mbedtls --without-ssl" env:
- T=debug C="--with-mbedtls --without-ssl"
- OVERRIDE_CC="CC=clang-7" OVERRIDE_CXX="CXX=clang++-7"
- os: linux - os: linux
compiler: clang compiler: clang
dist: trusty dist: trusty
env: T=debug C="--with-gnutls --without-ssl" env:
- T=debug C="--with-gnutls --without-ssl"
- OVERRIDE_CC="CC=clang-7" OVERRIDE_CXX="CXX=clang++-7"
- os: linux - os: linux
compiler: clang compiler: clang
dist: trusty dist: trusty
env: T=debug C="--disable-threaded-resolver" env:
- T=debug C="--disable-threaded-resolver"
- OVERRIDE_CC="CC=clang-7" OVERRIDE_CXX="CXX=clang++-7"
- os: linux - os: linux
compiler: clang compiler: clang
dist: trusty dist: trusty
env: T=debug C="--with-nss --without-ssl" NOTESTS=1 CPPFLAGS="-isystem /usr/include/nss" env:
- T=debug C="--with-nss --without-ssl" NOTESTS=1 CPPFLAGS="-isystem /usr/include/nss"
- OVERRIDE_CC="CC=clang-7" OVERRIDE_CXX="CXX=clang++-7"
- os: linux - os: linux
compiler: gcc compiler: gcc
dist: trusty dist: trusty
env: T=iconv env:
- T=iconv
- OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
- os: osx - os: osx
compiler: gcc compiler: gcc
env: T=debug C=--with-libssh2 env: T=debug C=--with-libssh2
@@ -134,35 +165,55 @@ matrix:
- os: linux - os: linux
compiler: gcc compiler: gcc
dist: trusty dist: trusty
env: T=cmake env:
- T=cmake
- OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
- os: linux - os: linux
compiler: clang compiler: clang
dist: trusty dist: trusty
env: T=cmake env:
- T=cmake
- OVERRIDE_CC="CC=clang-7" OVERRIDE_CXX="CXX=clang++-7"
- os: linux - os: linux
compiler: gcc compiler: gcc
dist: trusty dist: trusty
env: T=coverage env:
- T=coverage
- OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
- os: linux - os: linux
compiler: gcc compiler: gcc
dist: trusty dist: trusty
env: T=distcheck env:
- T=distcheck
- OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
- os: linux - os: linux
compiler: clang compiler: clang
dist: trusty dist: trusty
env: T=fuzzer env:
- T=fuzzer
- OVERRIDE_CC="CC=clang-7" OVERRIDE_CXX="CXX=clang++-7"
- os: linux - os: linux
compiler: clang compiler: clang
dist: trusty dist: trusty
env: T=tidy env:
- T=tidy
- OVERRIDE_CC="CC=clang-7" OVERRIDE_CXX="CXX=clang++-7"
- os: linux - os: linux
compiler: clang compiler: clang
dist: trusty dist: trusty
env: T=scan-build env:
- T=scan-build
- OVERRIDE_CC="CC=clang-7" OVERRIDE_CXX="CXX=clang++-7"
- os: linux - os: linux
compiler: clang compiler: clang
dist: trusty dist: trusty
env: T=debug CFLAGS="-fsanitize=address,undefined,signed-integer-overflow -fno-sanitize-recover=undefined,integer -Wformat -Werror=format-security -Werror=array-bounds -g" LDFLAGS="-fsanitize=address,undefined -fno-sanitize-recover=undefined,integer" LIBS="-ldl -lubsan" env:
- T=debug CFLAGS="-fsanitize=address,undefined,signed-integer-overflow -fno-sanitize-recover=undefined,integer -Wformat -Werror=format-security -Werror=array-bounds -g" LDFLAGS="-fsanitize=address,undefined -fno-sanitize-recover=undefined,integer" LIBS="-ldl -lubsan"
- OVERRIDE_CC="CC=clang-7" OVERRIDE_CXX="CXX=clang++-7"

before_install:
- eval "${OVERRIDE_CC}"
- eval "${OVERRIDE_CXX}"


install: install:
- if [ "$T" = "coverage" ]; then pip2 install --user cpp-coveralls; fi - if [ "$T" = "coverage" ]; then pip2 install --user cpp-coveralls; fi
@@ -193,7 +244,7 @@ before_script:
cd boringssl && cd boringssl &&
mkdir build && mkdir build &&
cd build && cd build &&
cmake -DCMAKE_BUILD_TYPE=release -DBUILD_SHARED_LIBS=1 .. && CXX="g++" CC="gcc" cmake -DCMAKE_BUILD_TYPE=release -DBUILD_SHARED_LIBS=1 .. &&
make && make &&
cd .. && cd .. &&
mkdir lib && mkdir lib &&
@@ -289,15 +340,14 @@ script:
- | - |
set -eo pipefail set -eo pipefail
if [ "$T" = "coverage" ]; then if [ "$T" = "coverage" ]; then
export CC="gcc-7"
./configure --enable-debug --disable-shared --enable-code-coverage ./configure --enable-debug --disable-shared --enable-code-coverage
make make
make TFLAGS=-n test-nonflaky make TFLAGS=-n test-nonflaky
make "TFLAGS=-n -e" test-nonflaky make "TFLAGS=-n -e" test-nonflaky
tests="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 200 201 202 300 301 302 500 501 502 503 504 506 507 508 509 510 511 512 513 514 515 516 517 518 519 600 601 700 701 702 800 801 802 803 900 901 902 903 1000 1001 1002 1004 1100 1101 1200 1201 1302 1303 1304 1305 1306 1308 1400 1401 1402 1404 1450 1451 1452 1502 1507 1508 1600 1602 1603 1605 1650 1651 1652 1653 1654 2001 2100 3000" tests="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 200 201 202 300 301 302 500 501 502 503 504 506 507 508 509 510 511 512 513 514 515 516 517 518 519 600 601 700 701 702 800 801 802 803 900 901 902 903 1000 1001 1002 1004 1100 1101 1200 1201 1302 1303 1304 1305 1306 1308 1400 1401 1402 1404 1450 1451 1452 1502 1507 1508 1600 1602 1603 1605 1650 1651 1652 1653 1654 2001 2100 3000"
make "TFLAGS=-n -t $tests" test-nonflaky make "TFLAGS=-n -t $tests" test-nonflaky
coveralls --gcov /usr/bin/gcov-7 --gcov-options '\-lp' -i src -e lib -e tests -e docs -b $PWD/src coveralls --gcov /usr/bin/gcov-8 --gcov-options '\-lp' -i src -e lib -e tests -e docs -b $PWD/src
coveralls --gcov /usr/bin/gcov-7 --gcov-options '\-lp' -e src -i lib -e tests -e docs -b $PWD/lib coveralls --gcov /usr/bin/gcov-8 --gcov-options '\-lp' -e src -i lib -e tests -e docs -b $PWD/lib
fi fi
- | - |
set -eo pipefail set -eo pipefail

0 comments on commit 8bd397d

Please sign in to comment.
You can’t perform that action at this time.