ci: Use extends to repeat libfprint builds

This syntax is just nicer and more maintainable than the YAML anchors
This commit is contained in:
Marco Trevisan (Treviño)
2020-02-14 16:17:12 +01:00
parent 53fcf52989
commit 750a815fdf

View File

@ -33,7 +33,7 @@ image: "$FEDORA_IMAGE"
variables: variables:
- $FPRINT_CRON_TASK == "BUILD_CI_IMAGES" - $FPRINT_CRON_TASK == "BUILD_CI_IMAGES"
.install_libfprint_dev: &install_libfprint_dev .install_libfprint_dev:
before_script: before_script:
# Make sure we don't build or link against the system libfprint # Make sure we don't build or link against the system libfprint
- dnf remove -y libfprint-devel - dnf remove -y libfprint-devel
@ -56,8 +56,9 @@ build_stable:
- ninja -C _build -v install - ninja -C _build -v install
build_dev: build_dev:
extends: .fprintd_build_preconditions extends:
<<: *install_libfprint_dev - .fprintd_build_preconditions
- .install_libfprint_dev
script: script:
- meson _build --werror -Dgtk_doc=true - meson _build --werror -Dgtk_doc=true
- ninja -C _build -v - ninja -C _build -v
@ -69,9 +70,10 @@ build_dev:
- _build/meson-logs/*.txt - _build/meson-logs/*.txt
test_dev: test_dev:
extends: .fprintd_build_preconditions extends:
- .fprintd_build_preconditions
- .install_libfprint_dev
stage: test stage: test
<<: *install_libfprint_dev
script: script:
- meson _build -Db_coverage=true - meson _build -Db_coverage=true
- meson test -C _build --verbose --no-stdsplit --timeout-multiplier 3 - meson test -C _build --verbose --no-stdsplit --timeout-multiplier 3