ci: Use extends to define extra libfprint variables

This allows to merge the values when included instead of replacing the whole
variables stanza.
This commit is contained in:
Marco Trevisan (Treviño) 2020-02-05 19:03:25 +01:00
parent ca5143ffa5
commit bb08d2e3c2
2 changed files with 33 additions and 32 deletions

View file

@ -1,16 +1,17 @@
variables:
FEDORA_TAG: rawhide
FEDORA_VERSION: rawhide
FEDORA_IMAGE: "$CI_REGISTRY/libfprint/$CI_PROJECT_NAME/fedora/$FEDORA_VERSION:$FEDORA_TAG"
BUNDLE: "org.freedesktop.libfprint.Demo.flatpak"
LAST_ABI_BREAK: "056ea541ddc97f5806cffbd99a12dc87e4da3546"
include: include:
- local: '.gitlab-ci/libfprint-templates.yaml' - local: '.gitlab-ci/libfprint-templates.yaml'
- project: 'wayland/ci-templates' - project: 'wayland/ci-templates'
ref: master ref: master
file: '/templates/fedora.yml' file: '/templates/fedora.yml'
variables:
extends: .libfprint_common_variables
FEDORA_TAG: rawhide
FEDORA_VERSION: rawhide
FEDORA_IMAGE: "$CI_REGISTRY/libfprint/$CI_PROJECT_NAME/fedora/$FEDORA_VERSION:$FEDORA_TAG"
BUNDLE: "org.freedesktop.libfprint.Demo.flatpak"
LAST_ABI_BREAK: "056ea541ddc97f5806cffbd99a12dc87e4da3546"
stages: stages:
- check-source - check-source
- build - build

View file

@ -1,26 +1,26 @@
variables: .libfprint_common_variables:
LIBFPRINT_DEPENDENCIES: LIBFPRINT_DEPENDENCIES:
doxygen doxygen
flatpak-builder flatpak-builder
gcc gcc
gcc-c++ gcc-c++
gcovr gcovr
git git
glib2-devel glib2-devel
glibc-devel glibc-devel
gobject-introspection-devel gobject-introspection-devel
gtk-doc gtk-doc
gtk3-devel gtk3-devel
libabigail libabigail
libgusb-devel libgusb-devel
libX11-devel libX11-devel
libXv-devel libXv-devel
meson meson
nss-devel nss-devel
pixman-devel pixman-devel
python3-cairo python3-cairo
python3-gobject python3-gobject
systemd systemd
umockdev umockdev
uncrustify uncrustify
valgrind valgrind