summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2018-04-09 20:30:57 +0200
committerDaniel Stenberg <daniel@haxx.se>2018-04-10 13:33:10 +0200
commitac6c86732b678a3bac9de92071bbc47af3ea8d1c (patch)
tree62e93722973649e6f590e0d33d6b3a35df5c4c9b /.travis.yml
parent0b87c963252d3504552ee0c8cf4402bd65a80af5 (diff)
downloadcurl-ac6c86732b678a3bac9de92071bbc47af3ea8d1c.tar.gz
travis: bump to clang 6 and gcc 7
Extra-eye-on-this-by: Marcel Raad Closes #2478
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml18
1 files changed, 9 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml
index 4b01ea7f9..428279cc9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,17 +6,17 @@ addons:
retries: true
sources:
- ubuntu-toolchain-r-test
- - llvm-toolchain-precise-3.9
+ - llvm-toolchain-trusty-6.0
packages:
- cmake
- - gcc-6
+ - gcc-7
- lcov
- - clang-3.9
+ - clang-6.0
- valgrind
- libev-dev
- libc-ares-dev
- - g++-6
- - libstdc++-6-dev
+ - g++-7
+ - libstdc++-7-dev
- stunnel4
- libidn2-0-dev
- libssh2-1-dev
@@ -104,7 +104,7 @@ install:
- if [ $TRAVIS_OS_NAME = linux ]; then
curl -L https://github.com/nghttp2/nghttp2/releases/download/v1.24.0/nghttp2-1.24.0.tar.gz |
tar xzf - &&
- (cd nghttp2-1.24.0 && CXX="g++-6" ./configure --prefix=/usr --disable-threads --enable-app && make && sudo make install);
+ (cd nghttp2-1.24.0 && CXX="g++-7" ./configure --prefix=/usr --disable-threads --enable-app && make && sudo make install);
fi
before_script:
@@ -145,15 +145,15 @@ script:
# Uncomment this when `coverage` runs on Trusty.
# set -eo pipefail
if [ "$T" = "coverage" ]; then
- export CC="gcc-6"
+ export CC="gcc-7"
./configure --enable-debug --disable-shared --enable-code-coverage
make
make TFLAGS=-n test-nonflaky
tests="1 2 3 4 5 6 7 8 9 10 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 800 801 802 803 900 901 902 903 1000 1001 1002 1004 1302 1303 1304 1305 1306 1308 1400 1401 1402 1404 1450 1451 1452 1502 1507 1508 1600 1602 1603 1605"
make "TFLAGS=-n -e $tests" test-nonflaky
make "TFLAGS=-n -t $tests" test-nonflaky
- coveralls --gcov /usr/bin/gcov-6 --gcov-options '\-lp' -i src -e lib -e tests -e docs -b $PWD/src
- coveralls --gcov /usr/bin/gcov-6 --gcov-options '\-lp' -e src -i lib -e tests -e docs -b $PWD/lib
+ 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-7 --gcov-options '\-lp' -e src -i lib -e tests -e docs -b $PWD/lib
fi
- |
set -eo pipefail