X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=.travis.yml;h=5624a9553c444a3f21b26d567b2bb1b9f1c5b5e1;hb=0fac6e4222ef3c995f2760fd747a9c104a725886;hp=c55c706d21fce22c4a7f0305315449af5091681f;hpb=7269c8f7a6521568205583671a4ab45d149cc1af;p=openjpeg.git diff --git a/.travis.yml b/.travis.yml index c55c706d..5624a955 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,10 +21,6 @@ matrix: - os: linux compiler: clang env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Debug OPJ_CI_ASAN=1 - - os: linux - compiler: clang-3.9 - env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release - sudo: true - os: linux compiler: x86_64-w64-mingw32-gcc env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release @@ -67,7 +63,7 @@ script: - ./tools/travis-ci/abi-check.sh before_deploy: - - export OPJ_RELEASE_PKG_FILE=$(ls openjpeg*.zip) + - export OPJ_RELEASE_PKG_FILE=$(ls build/openjpeg-${TRAVIS_TAG}*) - echo "deploying $OPJ_RELEASE_PKG_FILE to GitHub releases" deploy: @@ -80,5 +76,5 @@ deploy: on: repo: uclouvain/openjpeg tags: true - condition: "$OPJ_CI_DEPLOY = 1" + condition: "$OPJ_CI_INCLUDE_IF_DEPLOY = 1"