Skip to content
This repository was archived by the owner on Jul 8, 2022. It is now read-only.

Commit 7e7846d

Browse files
committed
.travis: Fix installation of non-stock cppzmq
In 86174ee (Travis Tests: Avoid code duplication, 2019-06-05) we added support for using the environment variable NON_STOCK_CPPZMQ to say if we use the stock version or the non-stock version. That commit got the logic wrong. Flip the naming to have now one less negation. STOCK_CPPZMQ=ON means that the system cppzmq is used, =OFF that we use the latest cppzmq from the repo.
1 parent 7a7c857 commit 7e7846d

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

.travis.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ language: cpp
44

55
env:
66
matrix:
7-
- OS_TYPE=debian10 CMAKE_BUILD_TYPE=Release SONAR_SCANNER=OFF COVERALLS=OFF NON_STOCK_CPPZMQ=ON
8-
- OS_TYPE=debian10 CMAKE_BUILD_TYPE=Debug SONAR_SCANNER=OFF COVERALLS=OFF NON_STOCK_CPPZMQ=ON
9-
- OS_TYPE=debian9 CMAKE_BUILD_TYPE=Debug SONAR_SCANNER=OFF COVERALLS=OFF NON_STOCK_CPPZMQ=ON
10-
- OS_TYPE=debian8 CMAKE_BUILD_TYPE=Debug SONAR_SCANNER=ON COVERALLS=ON NON_STOCK_CPPZMQ=OFF
11-
- OS_TYPE=debian7 CMAKE_BUILD_TYPE=Debug SONAR_SCANNER=OFF COVERALLS=OFF NON_STOCK_CPPZMQ=ON
7+
- OS_TYPE=debian10 CMAKE_BUILD_TYPE=Release SONAR_SCANNER=OFF COVERALLS=OFF STOCK_CPPZMQ=ON
8+
- OS_TYPE=debian10 CMAKE_BUILD_TYPE=Debug SONAR_SCANNER=OFF COVERALLS=OFF STOCK_CPPZMQ=ON
9+
- OS_TYPE=debian9 CMAKE_BUILD_TYPE=Debug SONAR_SCANNER=OFF COVERALLS=OFF STOCK_CPPZMQ=ON
10+
- OS_TYPE=debian8 CMAKE_BUILD_TYPE=Debug SONAR_SCANNER=ON COVERALLS=ON STOCK_CPPZMQ=OFF
11+
- OS_TYPE=debian7 CMAKE_BUILD_TYPE=Debug SONAR_SCANNER=OFF COVERALLS=OFF STOCK_CPPZMQ=ON
1212

1313
notifications:
1414
email: false
@@ -44,7 +44,7 @@ before_script:
4444
- docker build --build-arg APP_UID=$(id -u) --build-arg APP_GID=$(id -g) -t cpp_tango .travis/${OS_TYPE}
4545
- docker run --name cpp_tango -e TANGO_HOST=${TANGO_HOST} -e BINTRAY_USER_NAME=tango-ci -e BINTRAY_API_KEY=${CI_BINTRAY_API_KEY} -e COVERALLS_REPO_TOKEN=${COVERALLS_REPO_TOKEN} --link tango_cs:tango_cs -v `pwd`:/home/tango/src -v `pwd`/idl:/home/tango/idl -v `pwd`/cppzmq:/home/tango/cppzmq -v `pwd`/coveralls-cmake:/home/tango/coveralls-cmake -v `pwd`/build-wrapper-linux-x86:/home/tango/build-wrapper-linux-x86 -dit cpp_tango
4646
- .travis/install_tango_idl.sh
47-
- (test ${NON_STOCK_CPPZMQ} = "ON" && .travis/install_cppzmq.sh) || true
47+
- (test ${STOCK_CPPZMQ} = "OFF" && .travis/install_cppzmq.sh) || true
4848
#work around gcov ignored by sonar
4949
- sudo mkdir /home/tango && sudo mkdir /home/tango/src && sudo mount --bind `pwd` /home/tango/src
5050

0 commit comments

Comments
 (0)