[gnome-build-meta/jjardon/abi-check: 3/3] Use external repo for ABI checker

[Javier Jardón Cabezas <jjardon src gnome org>]

commit 1b1b784716c7019a617ac327ce9214392b0cdc64
Author: Javier Jardón <jjardon gnome org>
Date:   Wed Apr 8 17:36:17 2020 +0100

    Use external repo for ABI checker
    
    This is now at
    https://gitlab.com/freedesktop-sdk/buildstream-abi-checker

 .gitlab-ci.yml                | 21 +++++++--------------
 .gitmodules                   |  3 +++
 utils/buildstream-abi-checker |  1 +
 3 files changed, 11 insertions(+), 14 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f3af7d85..71824b46 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,13 +9,14 @@ variables:
   BST: "bst $BST_STRICT --config build.conf --log-file logs/build.log --colors"
   DOCKER_IMAGE_ID: '80f4a16af18b8641874fe037710dcaad4710ff50'
   FLATPAK_BRANCH: master
-  STABLE_ABI: false
 
   # Docker Images
   DOCKER_REGISTRY: "registry.gitlab.com/freedesktop-sdk/infrastructure/freedesktop-sdk-docker-images"
   DOCKER_AMD64: "${DOCKER_REGISTRY}/bst14/amd64:${DOCKER_IMAGE_ID}"
   DOCKER_AARCH64: "${DOCKER_REGISTRY}/bst14/arm64:${DOCKER_IMAGE_ID}"
 
+  GIT_SUBMODULE_STRATEGY: "recursive"
+
 stages:
 - track
 - build
@@ -87,6 +88,11 @@ default:
     if [ "${ARCH}" == "x86_64" ]; then
         ${BST} build openh264-extension.bst:flatpak-repo.bst
     fi
+  - |
+    if test "$FLATPAK_BRANCH" != 'master' -a "$CI_COMMIT_REF_NAME" != /^gnome-\d-\d\d$/; then
+        REFERENCE=$(git merge-base origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME HEAD) \
+        ./utils/buildstream-abi-checker/check-abi --bst-opts="${ARCH}" 
--suppressions=utils/abidiff-suppressions.ini -old="${REFERENCE}" --new=HEAD abi/abi-image.bst
+    fi
 
   # Store all the downloaded git repos and tarballs in the cache.
   # This saves us fetching them on every build
@@ -317,16 +323,3 @@ cve_report:
     - cve-reports
   rules:
   - if: $CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_REF_NAME =~ /^gnome-\d-\d\d$/
-
-check_abi:
-  <<: *x86_64
-  stage: reports
-  dependencies: [build]
-  script:
-    - if [ $STABLE_ABI != 'false' ]; then \
-        REFERENCE=$(git merge-base origin/$FLATPAK_BRANCH HEAD) \
-        ./utils/buildstream-abi-checker/check-abi ---suppressions=utils/abidiff-suppressions.ini 
-old=$REFERENCE --new=HEAD abi/abi-image.bst
-      fi
-  only:
-    - master
-    - /^gnome-\d-\d\d$/
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..04ae20af
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "utils/buildstream-abi-checker"]
+       path = utils/buildstream-abi-checker
+       url = https://gitlab.com/freedesktop-sdk/buildstream-abi-checker.git
diff --git a/utils/buildstream-abi-checker b/utils/buildstream-abi-checker
new file mode 160000
index 00000000..7f4ae33f
--- /dev/null
+++ b/utils/buildstream-abi-checker
@@ -0,0 +1 @@
+Subproject commit 7f4ae33fa66bb90e51fb0f5a532433b54dc7da2a