gitlab CI: run the scan-build analysis jobs in script

after_script ignores any exit status so we can't actually fail the job here

Fixes #573

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 3eb428ef568808e4af115a64531a21fa28ed8dd2)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 780ac17e1a2c203db5200720e5b7bd007c2566bc..8e25335a2552d6c8694679af54afed11cbd0018d 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -643,7 +643,8 @@ scan-build@fedora:32:
     MESON_TEST_ARGS: ''
   before_script:
     - dnf install -y clang-analyzer findutils
-  after_script:
+  script:
+    - .gitlab-ci/meson-build.sh
     - test ! -d "$MESON_BUILDDIR"/meson-logs/scanbuild && exit 0
     - test $(find "$MESON_BUILDDIR"/meson-logs/scanbuild -maxdepth 0 ! -empty -exec echo "not empty" \; | wc -l) -eq 0 && exit 0
     - echo "Check scan-build results"

diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index 74c8bce0e7efc1949e93d57e48d283cc91f56fa9..6da7cbd1e1ade9e5a9c29098a33c652a4f28e084 100644 (file)
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -485,7 +485,8 @@ scan-build@{{distro.name}}:{{version}}:
     MESON_TEST_ARGS: ''
   before_script:
     - dnf install -y clang-analyzer findutils
-  after_script:
+  script:
+    - .gitlab-ci/meson-build.sh
     - test ! -d "$MESON_BUILDDIR"/meson-logs/scanbuild && exit 0
     - test $(find "$MESON_BUILDDIR"/meson-logs/scanbuild -maxdepth 0 ! -empty -exec echo "not empty" \; | wc -l) -eq 0 && exit 0
     - echo "Check scan-build results"