From 7420f9eccd6ffda89180f853eca9db6efc93fb46 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Tue, 13 Feb 2024 10:23:12 +0000 Subject: [PATCH] ci: Fix printing the execution environment Deriving from two templates means the `before_script` from the second one overrides, rather than adding to, the one from the first. Avoid that when using `.build-linux` and `.with-git` by explicitly joining both scripts. Signed-off-by: Philip Withnall --- .gitlab-ci.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d1d59c62f..713d9ddc5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -175,6 +175,9 @@ fedora-x86_64: needs: [] variables: CFLAGS: "-coverage -ftest-coverage -fprofile-arcs" + before_script: + - !reference [".build-linux", "before_script"] + - !reference [".with-git", "before_script"] script: - meson setup ${MESON_COMMON_OPTIONS} --werror @@ -227,6 +230,9 @@ debian-stable-x86_64: image: $DEBIAN_IMAGE stage: build needs: [] + before_script: + - !reference [".build-linux", "before_script"] + - !reference [".with-git", "before_script"] script: - meson setup ${MESON_COMMON_OPTIONS} --werror @@ -296,6 +302,9 @@ muslc-alpine-x86_64: image: $ALPINE_IMAGE stage: build needs: [] + before_script: + - !reference [".build-linux", "before_script"] + - !reference [".with-git", "before_script"] script: - meson setup ${MESON_COMMON_OPTIONS} --werror @@ -368,6 +377,9 @@ G_DISABLE_ASSERT: needs: [] variables: MESON_TEST_TIMEOUT_MULTIPLIER: 15 + before_script: + - !reference [".build-linux", "before_script"] + - !reference [".with-git", "before_script"] script: - meson setup ${MESON_COMMON_OPTIONS} --werror @@ -403,6 +415,9 @@ valgrind: needs: [] variables: MESON_TEST_TIMEOUT_MULTIPLIER: 15 + before_script: + - !reference [".build-linux", "before_script"] + - !reference [".with-git", "before_script"] script: - meson setup ${MESON_COMMON_OPTIONS} --werror