diff options
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rwxr-xr-x | platform/node/scripts/after_script.sh | 5 |
2 files changed, 7 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index e0b733e4aa..793f0130d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ script: - make run-test after_script: - ccache --show-stats - - ./platform/linux/scripts/after_script.sh ${TRAVIS_JOB_NUMBER} ${TRAVIS_TAG:-} + - ./platform/linux/scripts/after_script.sh ${TRAVIS_JOB_NUMBER} matrix: include: @@ -63,16 +63,16 @@ matrix: addons: *clang35 before_script: - export PACKAGE_JSON_VERSION=$(node -e "console.log(require('./package.json').version)") - - export PUBLISH=$([[ ${TAG} == "node-v${PACKAGE_JSON_VERSION}" ]] && echo 1 || echo 0) - - export BUILDTYPE=$([[ ${PUBLISH} ]] && echo "Release" || echo "Debug") + - export PUBLISH=$([[ "${TRAVIS_TAG:-}" == "node-v${PACKAGE_JSON_VERSION}" ]] && echo true) + - export BUILDTYPE=$([[ -n ${PUBLISH:-} ]] && echo "Release" || echo "Debug") script: - nvm install 4 - nvm use 4 - make node - - if [[ ! ${PUBLISH} ]]; then make test-node; fi + - if [[ -z ${PUBLISH} ]]; then make test-node; fi after_script: - ccache --show-stats - - ./platform/node/scripts/after_script.sh ${TRAVIS_JOB_NUMBER} ${TRAVIS_TAG:-} + - ./platform/node/scripts/after_script.sh ${TRAVIS_JOB_NUMBER} # GCC 5 - Debug - Coverage - os: linux diff --git a/platform/node/scripts/after_script.sh b/platform/node/scripts/after_script.sh index 311511726a..c805e453a2 100755 --- a/platform/node/scripts/after_script.sh +++ b/platform/node/scripts/after_script.sh @@ -4,10 +4,9 @@ set -e set -o pipefail JOB=$1 -TAG=$2 -if [[ ${PUBLISH} ]]; then - if [[ "$BUILDTYPE" == "Debug" ]]; then +if [[ -n ${PUBLISH:-} ]]; then + if [[ "${BUILDTYPE}" == "Debug" ]]; then echo "Please run this script in release mode (BUILDTYPE=Release)." exit 1 else |