summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonin Descampe <antonin@gmail.com>2017-08-02 16:50:11 +0200
committerAntonin Descampe <antonin@gmail.com>2017-08-02 16:50:11 +0200
commiteb90d8ec935eba934bfd260cc80c8ef445dff4fd (patch)
treee5fe3c6c08369f4b87c674a3ec48fbcc6b655c10
parent48125b0d124bc668b971b1f5df5a3c39798cfcf9 (diff)
WIP: fix abi-check and automatic upload
-rwxr-xr-xtools/travis-ci/abi-check.sh16
1 files changed, 15 insertions, 1 deletions
diff --git a/tools/travis-ci/abi-check.sh b/tools/travis-ci/abi-check.sh
index c6f8de61..d17a7f5c 100755
--- a/tools/travis-ci/abi-check.sh
+++ b/tools/travis-ci/abi-check.sh
@@ -13,6 +13,16 @@ if [ "${OPJ_CI_ABI_CHECK:-}" != "1" ]; then
exit 0
fi
+if [ "${OPJ_CI_CC:-}" != "" ]; then
+ export CC=${OPJ_CI_CC}
+ echo "Using ${CC}"
+fi
+
+if [ "${OPJ_CI_CXX:-}" != "" ]; then
+ export CXX=${OPJ_CI_CXX}
+ echo "Using ${CXX}"
+fi
+
OPJ_UPLOAD_ABI_REPORT=0
#OPJ_PREVIOUS_VERSION="2.1.1"
OPJ_LATEST_VERSION="2.1.2"
@@ -59,6 +69,10 @@ mkdir ${PWD}/tools/abi-tracker
make -C installer-0.10 install prefix=${PWD}/tools/abi-tracker target=abi-tracker
export PATH=${PWD}/tools/abi-tracker/bin:$PATH
+# This will print configuration
+# travis-ci doesn't dump cmake version in system info, let's print it
+cmake --version
+
# RUN THE ABI-CHECK SCRIPTS
mkdir work
@@ -106,7 +120,7 @@ fi
rm -rf src/openjpeg/current
rm -rf build_logs
-
+
if [ ${OPJ_UPLOAD_ABI_REPORT} -eq 1 ]; then
git config user.name "OpenJPEG Travis CI"
git config user.email "info@openjpeg.org"