diff options
| author | Antonin Descampe <antonin@gmail.com> | 2016-09-29 22:06:23 +0200 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2016-09-29 22:06:23 +0200 |
| commit | b0791988385053075c5998bf0fe4f56a249ad56f (patch) | |
| tree | 94eab5ffb1ae4b02601ecee4fed56b09a6351917 /tools/travis-ci | |
| parent | 110d31891b459c673c7c788cf8170cadfd2201bf (diff) | |
fix abi-check and limit upload to website for master
Diffstat (limited to 'tools/travis-ci')
| -rwxr-xr-x | tools/travis-ci/abi-check.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/travis-ci/abi-check.sh b/tools/travis-ci/abi-check.sh index 6845ed0a..c6f8de61 100755 --- a/tools/travis-ci/abi-check.sh +++ b/tools/travis-ci/abi-check.sh @@ -14,7 +14,7 @@ if [ "${OPJ_CI_ABI_CHECK:-}" != "1" ]; then fi OPJ_UPLOAD_ABI_REPORT=0 -OPJ_PREVIOUS_VERSION="2.1.1" +#OPJ_PREVIOUS_VERSION="2.1.1" OPJ_LATEST_VERSION="2.1.2" if [ "${OPJ_PREVIOUS_VERSION:-}" != "" ]; then OPJ_LIMIT_ABI_BUILDS="-limit 3" @@ -26,7 +26,7 @@ OPJ_SSH_REPO=${OPJ_REPO/https:\/\/github.com\//git@github.com:} OPJ_UPLOAD_BRANCH="gh-pages" OPJ_UPLOAD_DIR="abi-check" if [ "${TRAVIS_REPO_SLUG:-}" != "" ]; then - if [ "$(echo "${TRAVIS_REPO_SLUG}" | sed 's/\(^.*\)\/.*/\1/')" == "uclouvain" ] && [ "${TRAVIS_PULL_REQUEST:-}" == "false" ]; then + if [ "$(echo "${TRAVIS_REPO_SLUG}" | sed 's/\(^.*\)\/.*/\1/')" == "uclouvain" ] && [ "${TRAVIS_PULL_REQUEST:-}" == "false" ] && [ "${TRAVIS_BRANCH:-}" == "master" ]; then # Upload updated report to gh-pages OPJ_UPLOAD_ABI_REPORT=1 # Build full report |