Fixing deployment condition

diff --git a/appveyor.yml b/appveyor.yml
index 73003d021647ede2af9d53c7159b60184d25a0c3..7c65acae65b39d46e4f9f9784e6d6289f7a76e8b 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -25,7 +25,7 @@ test: off
 #before_deploy:
 #- cmd: c:\cygwin\bin\bash ./tools/travis-ci/before_deploy.sh
 deploy:
-  release: openjpeg-$(appveyor_repo_tag_name)
+  #release: openjpeg-$(appveyor_repo_tag_name)
   description: 'OpenJPEG $(appveyor_repo_tag_name) has been released'
   provider: GitHub
   auth_token:

diff --git a/tools/travis-ci/run.sh b/tools/travis-ci/run.sh
index 7bc84b81e1282f6156eb41fe52ba94b2f4d437cc..782622b505c855eb5ff1ff02ee9e5bd3f2d1d32a 100755 (executable)
--- a/tools/travis-ci/run.sh
+++ b/tools/travis-ci/run.sh
@@ -191,7 +191,14 @@ set +x
 
 # Deployment if needed
 #---------------------
-if [ "${OPJ_CI_INCLUDE_IF_DEPLOY:-}" == "1" ] && [ [ "${TRAVIS_TAG:-}" != "" ] || [ "${APPVEYOR_REPO_TAG:-}" == "true" ] ]; then
+if [ "${TRAVIS_TAG:-}" != "" ]; then
+               OPJ_TAG_NAME=${TRAVIS_TAG}
+       elif [ "${APPVEYOR_REPO_TAG:-}" == "true" ]; then
+               OPJ_TAG_NAME=${APPVEYOR_REPO_TAG_NAME}
+       else
+               OPJ_TAG_NAME=""
+       fi
+if [ "${OPJ_CI_INCLUDE_IF_DEPLOY:-}" == "1" ] && [ "${OPJ_TAG_NAME:-}" != "" ]; then
 #if [ "${OPJ_CI_INCLUDE_IF_DEPLOY:-}" == "1" ]; then
        OPJ_CI_DEPLOY=1         # unused for now
        OPJ_CUR_DIR=${PWD}
@@ -200,13 +207,6 @@ if [ "${OPJ_CI_INCLUDE_IF_DEPLOY:-}" == "1" ] && [ [ "${TRAVIS_TAG:-}" != "" ] |
        else
                OPJ_PACK_GENERATOR="ZIP"
        fi
-       if [ "${TRAVIS_TAG:-}" != "" ]; then
-               OPJ_TAG_NAME=${TRAVIS_TAG}
-       elif [ "${APPVEYOR_REPO_TAG:-}" == "true" ]; then
-               OPJ_TAG_NAME=${APPVEYOR_REPO_TAG_NAME}
-       else
-               OPJ_TAG_NAME=test
-       fi
        OPJ_PACK_NAME="openjpeg-${OPJ_TAG_NAME}-${TRAVIS_OS_NAME}-${OPJ_CI_ARCH}"
        cd ${OPJ_BINARY_DIR}
        cmake -D CPACK_GENERATOR:STRING=${OPJ_PACK_GENERATOR} -D CPACK_PACKAGE_FILE_NAME:STRING=${OPJ_PACK_NAME} ${OPJ_SOURCE_DIR}