luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-03 09:46:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

ci: Fix printing the execution environment

Browse Source 
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 <pwithnall@gnome.org>
This commit is contained in:
Philip Withnall 2024-02-13 10:23:12 +00:00 committed by Simon McVittie
parent 060a7c2740
commit 7420f9eccd
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.gitlab-ci.yml
View File

@ -175,6 +175,9 @@ fedora-x86_64:
needs: [] needs: []
variables: variables:
CFLAGS: "-coverage -ftest-coverage -fprofile-arcs" CFLAGS: "-coverage -ftest-coverage -fprofile-arcs"
before_script:
- !reference [".build-linux", "before_script"]
- !reference [".with-git", "before_script"]
script: script:
- meson setup ${MESON_COMMON_OPTIONS} - meson setup ${MESON_COMMON_OPTIONS}
--werror --werror
@ -227,6 +230,9 @@ debian-stable-x86_64:
image: $DEBIAN_IMAGE image: $DEBIAN_IMAGE
stage: build stage: build
needs: [] needs: []
before_script:
- !reference [".build-linux", "before_script"]
- !reference [".with-git", "before_script"]
script: script:
- meson setup ${MESON_COMMON_OPTIONS} - meson setup ${MESON_COMMON_OPTIONS}
--werror --werror
@ -296,6 +302,9 @@ muslc-alpine-x86_64:
image: $ALPINE_IMAGE image: $ALPINE_IMAGE
stage: build stage: build
needs: [] needs: []
before_script:
- !reference [".build-linux", "before_script"]
- !reference [".with-git", "before_script"]
script: script:
- meson setup ${MESON_COMMON_OPTIONS} - meson setup ${MESON_COMMON_OPTIONS}
--werror --werror
@ -368,6 +377,9 @@ G_DISABLE_ASSERT:
needs: [] needs: []
variables: variables:
MESON_TEST_TIMEOUT_MULTIPLIER: 15 MESON_TEST_TIMEOUT_MULTIPLIER: 15
before_script:
- !reference [".build-linux", "before_script"]
- !reference [".with-git", "before_script"]
script: script:
- meson setup ${MESON_COMMON_OPTIONS} - meson setup ${MESON_COMMON_OPTIONS}
--werror --werror
@ -403,6 +415,9 @@ valgrind:
needs: [] needs: []
variables: variables:
MESON_TEST_TIMEOUT_MULTIPLIER: 15 MESON_TEST_TIMEOUT_MULTIPLIER: 15
before_script:
- !reference [".build-linux", "before_script"]
- !reference [".with-git", "before_script"]
script: script:
- meson setup ${MESON_COMMON_OPTIONS} - meson setup ${MESON_COMMON_OPTIONS}
--werror --werror