summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2021-02-12 07:28:18 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2021-02-24 09:47:38 +1000
commit35c661aa3a9930c0f20c9f74b249d5aa4d02d9b3 (patch)
treeb22e3892009adc62a613ef29b9203c0a2a503177
parent39ac181ffc15064c05e2558f9eab1ec666509d1e (diff)
downloadlibinput-35c661aa3a9930c0f20c9f74b249d5aa4d02d9b3.tar.gz
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)
-rw-r--r--.gitlab-ci.yml3
-rw-r--r--.gitlab-ci/ci.template3
2 files changed, 4 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 780ac17e..8e25335a 100644
--- 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 74c8bce0..6da7cbd1 100644
--- 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"