File tree Expand file tree Collapse file tree 1 file changed +8
-4
lines changed Expand file tree Collapse file tree 1 file changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -412,22 +412,24 @@ matrix:
412
412
- g++-4.9
413
413
- gcc-4.9
414
414
. endif
415
+ .if !defined(project.travis_dist) | (project.travis_dist ?<> "xenial")
415
416
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
416
417
os: linux
417
- .if (project.travis_dist ?<> "")
418
+ . if (project.travis_dist ?<> "")
418
419
dist: $(project.travis_dist)
419
- .endif
420
+ . endif
420
421
addons:
421
422
apt:
422
423
sources:
423
424
- ubuntu-toolchain-r-test
424
- .if (pkg_src_zeromq_dist ?<> "")
425
+ . if (pkg_src_zeromq_dist ?<> "")
425
426
- *$(pkg_src_zeromq_dist)
426
- .endif
427
+ . endif
427
428
packages:
428
429
- *pkg_deps_common
429
430
- g++-5
430
431
- gcc-5
432
+ .endif
431
433
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
432
434
os: linux
433
435
.if (project.travis_dist ?<> "")
@@ -505,7 +507,9 @@ matrix:
505
507
. if !(use_cxx_gcc_4_9 ?= 1)
506
508
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
507
509
. endif
510
+ . if !defined(project.travis_dist) | (project.travis_dist ?<> "xenial")
508
511
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
512
+ . endif
509
513
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
510
514
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
511
515
. endif
You can’t perform that action at this time.
0 commit comments