From d6be962af9b9eb00071044d90be1517288bfd4f3 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Thu, 12 Sep 2024 21:46:31 +0100 Subject: [PATCH] ci: Fix subproject initialisation for scan-build and coverity Fixes commit 93271385f9cb83cdbdf9f850842d3ddae518ed8d. Previously the `before_script` from `.build-linux` was used in whole for these two jobs, but since the `.build-gobject-introspection` template was also added, the `before_script`s from the two templates need to be explicitly combined. Signed-off-by: Philip Withnall Fixes: #3458 --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 26eff640e..a4dab477b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -790,6 +790,7 @@ scan-build: -disable-checker deadcode.DeadStores --status-bugs before_script: + - !reference [".build-linux", "before_script"] - !reference [".build-gobject-introspection", "before_script"] script: - meson setup ${MESON_COMMON_OPTIONS} @@ -824,6 +825,7 @@ scan-build: # cov-build doesn’t like GLIB_DEPRECATED_ENUMERATOR CFLAGS: '-DGLIB_DISABLE_DEPRECATION_WARNINGS' before_script: + - !reference [".build-linux", "before_script"] - !reference [".build-gobject-introspection", "before_script"] script: - meson setup ${MESON_COMMON_OPTIONS}