Skip to content

Commit 6b342f0

Browse files
committed
zproject_travis.gsl : do not shadow with gcc-4.9 if we require it as the baseline
1 parent eb1f04b commit 6b342f0

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

zproject_travis.gsl

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -394,22 +394,24 @@ matrix:
394394
- clang-3.8
395395
.endif
396396
.if defined (project.travis_shadow_gcc) & !(project.travis_shadow_gcc ?= 0)
397+
. if !(defined(use_cxx_gcc_4_9)) | !(use_cxx_gcc_4_9 ?= 1)
397398
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
398399
os: linux
399-
.if (project.travis_dist ?<> "")
400+
. if (project.travis_dist ?<> "")
400401
dist: $(project.travis_dist)
401-
.endif
402+
. endif
402403
addons:
403404
apt:
404405
sources:
405406
- ubuntu-toolchain-r-test
406-
.if (pkg_src_zeromq_dist ?<> "")
407+
. if (pkg_src_zeromq_dist ?<> "")
407408
- *$(pkg_src_zeromq_dist)
408-
.endif
409+
. endif
409410
packages:
410411
- *pkg_deps_common
411412
- g++-4.9
412413
- gcc-4.9
414+
. endif
413415
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
414416
os: linux
415417
.if (project.travis_dist ?<> "")
@@ -500,7 +502,9 @@ matrix:
500502
. endif
501503
. if project.travis_shadow_gcc ?= 2
502504
. echo "TRAVIS: Shadow GCC versions: allow-fail: true"
505+
. if !(use_cxx_gcc_4_9 ?= 1)
503506
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
507+
. endif
504508
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
505509
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
506510
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"

0 commit comments

Comments
 (0)