summaryrefslogtreecommitdiff
path: root/.gitlab-ci/ci.template
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab-ci/ci.template')
-rw-r--r--.gitlab-ci/ci.template12
1 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index 9970c026..8c2fe1d0 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -454,16 +454,16 @@ scan-build@{{distro.name}}:{{version}}:
extends:
- .{{distro.name}}-build@template
variables:
- NINJA_ARGS: scan-build
+ NINJA_ARGS: ''
MESON_TEST_ARGS: ''
before_script:
- - dnf install -y clang-analyzer findutils
+ - dnf install -y clang-analyzer
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"
- - /bin/false
+ - export SCANBUILD="$PWD/.gitlab-ci/scanbuild-wrapper.sh"
+ - ninja -C "$MESON_BUILDDIR" scan-build
+ after_script:
+ - .gitlab-ci/scanbuild-plist-to-junit.py "$MESON_BUILDDIR"/meson-logs/scanbuild/ > "$MESON_BUILDDIR"/junit-scan-build.xml
# Below jobs are build option combinations. We only
# run them on one image, they shouldn't fail on one distro