cookiez/pam-fprint-grosshack
1
0
Fork 0
mirror of https://gitlab.com/mishakmak/pam-fprint-grosshack.git synced 2026-04-09 12:23:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

ci: Update CI after the fdo template changes

Browse Source 
The CI definition needs to be updated to work with the new fdo
templates.

Adapted from bd4f118b5e
This commit is contained in:
Bastien Nocera
2020-03-24 15:50:57 +01:00
parent 23c37cd9b5
commit cf95187268
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.gitlab-ci.yml
View File

@ -8,9 +8,9 @@ include:
variables: variables:
extends: .libfprint_common_variables extends: .libfprint_common_variables
FEDORA_TAG: rawhide FDO_DISTRIBUTION_TAG: latest
FEDORA_VERSION: rawhide FDO_DISTRIBUTION_VERSION: rawhide
FEDORA_IMAGE: "$CI_REGISTRY/libfprint/$CI_PROJECT_NAME/fedora/$FEDORA_VERSION:$FEDORA_TAG" FEDORA_IMAGE: "$CI_REGISTRY/libfprint/$CI_PROJECT_NAME/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG"
DEPENDENCIES: dbus-glib-devel DEPENDENCIES: dbus-glib-devel
gcc gcc
gcovr gcovr
@ -85,13 +85,13 @@ test_dev:
# CONTAINERS creation stage # CONTAINERS creation stage
container_fedora_build: container_fedora_build:
extends: .fedora@container-build extends: .fdo.container-build@fedora
only: only:
variables: variables:
- $FPRINT_CRON_TASK == "BUILD_CI_IMAGES" - $FPRINT_CRON_TASK == "BUILD_CI_IMAGES"
variables: variables:
GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
# a list of packages to install # a list of packages to install
FEDORA_RPMS: FDO_DISTRIBUTION_PACKAGES:
$DEPENDENCIES $DEPENDENCIES
$LIBFPRINT_DEPENDENCIES $LIBFPRINT_DEPENDENCIES