ci: split the build_on_fedora job up into a template and a real job

Let's use a template for the generic case of "building on Fedora"
and a named job for the specific job itself.

The real change here is the artifact handling: by default the artifacts
collected for a .build job are only the meson build logs.

The build_on_fedora job collects the installed files as well (to be used in
the pages job later).
This commit is contained in:
Peter Hutterer 2021-04-15 13:27:06 +10:00
parent 2d8ee2b86d
commit 2f78829fda

View file

@ -84,6 +84,11 @@ include:
- ninja -C "$BUILD_DIR" test - ninja -C "$BUILD_DIR" test
- ninja -C "$BUILD_DIR" install - ninja -C "$BUILD_DIR" install
- ./check_missing_headers.sh - ./check_missing_headers.sh
artifacts:
name: pipewire-$CI_COMMIT_SHA
when: always
paths:
- build-*/meson-logs
container_fedora: container_fedora:
extends: extends:
@ -102,19 +107,17 @@ container_coverity:
variables: variables:
GIT_STRATEGY: none GIT_STRATEGY: none
build_on_fedora: .build_on_fedora:
extends: extends:
- .fedora - .fedora
- .not_coverity - .not_coverity
- .fdo.distribution-image@fedora - .fdo.distribution-image@fedora
- .build - .build
stage: build stage: build
artifacts:
name: pipewire-$CI_COMMIT_SHA build_on_fedora:
when: always extends:
paths: - .build_on_fedora
- build-*/meson-logs
- prefix-*
variables: variables:
MESON_OPTIONS: >- MESON_OPTIONS: >-
-Ddocs=enabled -Ddocs=enabled
@ -128,18 +131,24 @@ build_on_fedora:
-Dvulkan=enabled -Dvulkan=enabled
-Dsdl2=enabled -Dsdl2=enabled
-Dsndfile=enabled -Dsndfile=enabled
artifacts:
name: pipewire-$CI_COMMIT_SHA
when: always
paths:
- build-*/meson-logs
- prefix-*
# build with all options on auto() or their default values # build with all options on auto() or their default values
build_with_no_commandline_options: build_with_no_commandline_options:
extends: extends:
- build_on_fedora - .build_on_fedora
variables: variables:
MESON_OPTIONS: "" MESON_OPTIONS: ""
# build with a set of options enabled or disabled # build with a set of options enabled or disabled
build_with_custom_options: build_with_custom_options:
extends: extends:
- build_on_fedora - .build_on_fedora
parallel: parallel:
matrix: matrix:
- MESON_OPTION: [docs, installed_tests, systemd-system-service, bluez5-backend-hsphfpd, - MESON_OPTION: [docs, installed_tests, systemd-system-service, bluez5-backend-hsphfpd,