From 2b458b09df57e7a74582d47225bc686df55b9212 Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Sat, 25 Jun 2016 00:40:04 +0200 Subject: [PATCH] Update abi-check.sh --- tools/travis-ci/abi-check.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/tools/travis-ci/abi-check.sh b/tools/travis-ci/abi-check.sh index b3b4cf0e..13d0ff50 100755 --- a/tools/travis-ci/abi-check.sh +++ b/tools/travis-ci/abi-check.sh @@ -59,12 +59,10 @@ export PATH=${PWD}/tools/abi-tracker/bin:$PATH mkdir work cd work -# If upload is scheduled, clone the gh-pages branch and work from there -if [ ${OPJ_UPLOAD_ABI_REPORT} -eq 1 ]; then - git clone -b $OPJ_UPLOAD_BRANCH --single-branch $OPJ_REPO . - cd $OPJ_UPLOAD_DIR - rm -rf installed/openjpeg/current/* -fi +# Clone the gh-pages branch and work from there +git clone -b $OPJ_UPLOAD_BRANCH --single-branch $OPJ_REPO . +cd $OPJ_UPLOAD_DIR +rm -rf installed/openjpeg/current/* # Let's create all we need grep -v Git ${OPJ_SOURCE_DIR}/tools/abi-tracker/openjpeg.json > ./openjpeg.json @@ -75,7 +73,6 @@ else # Old versions of openjpeg don't like -fvisibility=hidden... grep -v Configure ${OPJ_SOURCE_DIR}/tools/abi-tracker/openjpeg.json > ./openjpeg.json fi -mkdir -p src/openjpeg cp -rf ${OPJ_SOURCE_DIR} src/openjpeg/current abi-monitor ${OPJ_LIMIT_ABI_BUILDS} -rebuild openjpeg.json abi-tracker -build openjpeg.json