update abi-check

diff --git a/tools/abi-tracker/openjpeg.json b/tools/abi-tracker/openjpeg.json
index ff0e112586718fffded6e3f7868fbb8db434ab3e..ebbd3d78001d46fc1f9efeb1e26fb8bb4cfdde2d 100644 (file)
--- a/tools/abi-tracker/openjpeg.json
+++ b/tools/abi-tracker/openjpeg.json
@@ -24,7 +24,7 @@
   {
     "Number":         "2.1.2",
     "Installed":      "installed/openjpeg/2.1.2",
-    "Source":         "src/openjpeg/2.1.2/v2.1.2.tar.gz",
+    "Source":         "src/openjpeg/2.1.2/version.-2.1.2.tar.gz",
     "Changelog":      "CHANGELOG.md",
     "HeadersDiff":    "On",
     "PkgDiff":        "Off",
@@ -36,7 +36,7 @@
   {
     "Number":         "2.1.1",
     "Installed":      "installed/openjpeg/2.1.1",
-    "Source":         "src/openjpeg/2.1.1/v2.1.1.tar.gz",
+    "Source":         "src/openjpeg/2.1.1/version.-2.1.1.tar.gz",
     "Changelog":      "CHANGELOG.md",
     "HeadersDiff":    "On",
     "PkgDiff":        "Off",

diff --git a/tools/travis-ci/abi-check.sh b/tools/travis-ci/abi-check.sh
index 5f96ee5d8c116913d095d9a88bc72e4fee479c22..c6f8de61a1aa2969dbdb6df59dddefdadf3c1dbb 100755 (executable)
--- 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"
+#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
@@ -71,7 +71,7 @@ rm -rf installed/openjpeg/current/*
 
 # Let's create all we need
 grep -v Git ${OPJ_SOURCE_DIR}/tools/abi-tracker/openjpeg.json > ./openjpeg.json
-#abi-monitor ${OPJ_LIMIT_ABI_BUILDS} -get openjpeg.json
+abi-monitor ${OPJ_LIMIT_ABI_BUILDS} -get openjpeg.json
 if [ "${OPJ_LIMIT_ABI_BUILDS}" != "" ]; then
        cp -f ${OPJ_SOURCE_DIR}/tools/abi-tracker/openjpeg.json ./openjpeg.json
 else
@@ -79,7 +79,11 @@ else
        grep -v Configure ${OPJ_SOURCE_DIR}/tools/abi-tracker/openjpeg.json > ./openjpeg.json
 fi
 cp -rf ${OPJ_SOURCE_DIR} src/openjpeg/current
-abi-monitor ${OPJ_LIMIT_ABI_BUILDS} -rebuild openjpeg.json
+abi-monitor -v current -build openjpeg.json
+abi-monitor -v ${OPJ_LATEST_VERSION} -build openjpeg.json
+if [ "${OPJ_PREVIOUS_VERSION:-}" != "" ]; then
+       abi-monitor -v ${OPJ_PREVIOUS_VERSION} -build openjpeg.json
+fi
 abi-tracker -build openjpeg.json
 
 EXIT_CODE=0