Commit bd4f118b authored by Benjamin Berg's avatar Benjamin Berg
Browse files

ci: Update CI after the fdo template changes

The CI definition needs to be updated to work with the new fdo
templates.
parent 9d4b5ad6
...@@ -6,9 +6,9 @@ include: ...@@ -6,9 +6,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"
BUNDLE: "org.freedesktop.libfprint.Demo.flatpak" BUNDLE: "org.freedesktop.libfprint.Demo.flatpak"
LAST_ABI_BREAK: "056ea541ddc97f5806cffbd99a12dc87e4da3546" LAST_ABI_BREAK: "056ea541ddc97f5806cffbd99a12dc87e4da3546"
...@@ -135,11 +135,11 @@ flatpak-manual master: ...@@ -135,11 +135,11 @@ flatpak-manual master:
# 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:
- $CI_PIPELINE_SOURCE == "schedule" && $CRON_TASK == "BUILD_CI_IMAGES" - $CI_PIPELINE_SOURCE == "schedule" && $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: $LIBFPRINT_DEPENDENCIES FDO_DISTRIBUTION_PACKAGES: $LIBFPRINT_DEPENDENCIES
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment