ci: Use extends to inherit test-setup values
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:
parent
0adf3dcba0
commit
c472570194
@ -337,7 +337,7 @@ build-wayland-only@x86_64:
|
||||
paths:
|
||||
- build/meson-logs
|
||||
|
||||
.test-setup: &test-setup
|
||||
.test-setup:
|
||||
variables:
|
||||
XDG_RUNTIME_DIR: "$CI_PROJECT_DIR/runtime-dir"
|
||||
GSETTINGS_SCHEMA_DIR: "$CI_PROJECT_DIR/build/data"
|
||||
@ -357,7 +357,7 @@ build-wayland-only@x86_64:
|
||||
.test-mutter-base:
|
||||
extends:
|
||||
- .fdo.distribution-image@fedora
|
||||
<<: *test-setup
|
||||
- .test-setup
|
||||
stage: test
|
||||
after_script:
|
||||
- pushd build
|
||||
@ -507,7 +507,7 @@ dist-mutter:
|
||||
- .fdo.distribution-image@fedora
|
||||
- .mutter.fedora@x86_64
|
||||
- .build-mutter-base
|
||||
<<: *test-setup
|
||||
- .test-setup
|
||||
stage: deploy
|
||||
needs:
|
||||
- build-fedora-container@x86_64
|
||||
|
Loading…
Reference in New Issue
Block a user