From c4d684cc33fe1882d3354e9d2836e23ece169602 Mon Sep 17 00:00:00 2001 From: Sebastian Ullrich Date: Wed, 31 May 2017 16:40:59 +0200 Subject: [PATCH] chore(.travis.yml.in): call cpack conditionally --- .travis.yml | 3 +-- .travis.yml.in | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index a2f65c0326..1d0140e362 100644 --- a/.travis.yml +++ b/.travis.yml @@ -117,9 +117,8 @@ script: ../src || exit - make -j2 || exit - export PATH="$TRAVIS_BUILD_DIR/bin:$PATH" - - cpack - if [[ $TEST != OFF ]]; then yes "A" | ctest -j2 --output-on-failure; fi - - if [[ $PACKAGE == TRUE ]]; then make package; fi + - if [[ $PACKAGE == TRUE ]]; then cpack; make package; fi - if [[ $TEST_LEANPKG_REGISTRY == ON ]]; then ../script/test_registry.py; fi - cd .. diff --git a/.travis.yml.in b/.travis.yml.in index 6e0883aee3..f1aa3b653f 100644 --- a/.travis.yml.in +++ b/.travis.yml.in @@ -117,9 +117,8 @@ script: ../src || exit - make -j2 || exit - export PATH="$TRAVIS_BUILD_DIR/bin:$PATH" - - cpack - if [[ $TEST != OFF ]]; then yes "A" | ctest -j2 --output-on-failure; fi - - if [[ $PACKAGE == TRUE ]]; then make package; fi + - if [[ $PACKAGE == TRUE ]]; then cpack; make package; fi - if [[ $TEST_LEANPKG_REGISTRY == ON ]]; then ../script/test_registry.py; fi - cd ..