brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: Use extends to inherit test-setup values

Browse Source 
Using the old replace syntax doesn't allow to extend dicts such as
variables or other values, but instead it replaces them.

So use a newer and safer syntax, given we don't need to replace any
parameter where used.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3024>
This commit is contained in:
Marco Trevisan (Treviño) 2023-05-26 10:57:40 +02:00
parent 0adf3dcba0
commit c472570194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@ -337,7 +337,7 @@ build-wayland-only@x86_64:
paths: paths:
- build/meson-logs - build/meson-logs
.test-setup: &test-setup .test-setup:
variables: variables:
XDG_RUNTIME_DIR: "$CI_PROJECT_DIR/runtime-dir" XDG_RUNTIME_DIR: "$CI_PROJECT_DIR/runtime-dir"
GSETTINGS_SCHEMA_DIR: "$CI_PROJECT_DIR/build/data" GSETTINGS_SCHEMA_DIR: "$CI_PROJECT_DIR/build/data"
@ -357,7 +357,7 @@ build-wayland-only@x86_64:
.test-mutter-base: .test-mutter-base:
extends: extends:
- .fdo.distribution-image@fedora - .fdo.distribution-image@fedora
<<: *test-setup - .test-setup
stage: test stage: test
after_script: after_script:
- pushd build - pushd build
@ -507,7 +507,7 @@ dist-mutter:
- .fdo.distribution-image@fedora - .fdo.distribution-image@fedora
- .mutter.fedora@x86_64 - .mutter.fedora@x86_64
- .build-mutter-base - .build-mutter-base
<<: *test-setup - .test-setup
stage: deploy stage: deploy
needs: needs:
- build-fedora-container@x86_64 - build-fedora-container@x86_64