mirrors/libfprint
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libfprint/libfprint.git synced 2025-11-15 07:38:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: Fix building flatpak using GNOME 42 runtime

Browse Source 
Use versioned ci template so we are sure what we're using
This commit is contained in:
Marco Trevisan (Treviño)
2023-09-27 16:21:04 +02:00
parent 5bff5bfea6
commit eb01d7c97d
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.gitlab-ci.yml
View File

@@ -4,7 +4,7 @@ include:
- project: 'freedesktop/ci-templates' - project: 'freedesktop/ci-templates'
ref: master ref: master
file: '/templates/fedora.yml' file: '/templates/fedora.yml'
- remote: 'https://gitlab.gnome.org/GNOME/citemplates/-/raw/master/flatpak/flatpak_ci_initiative.yml' - remote: 'https://gitlab.gnome.org/GNOME/citemplates/-/raw/21e7c107/flatpak/flatpak_ci_initiative.yml'
default: default:
# Auto-retry jobs in case of infra failures # Auto-retry jobs in case of infra failures
@@ -22,7 +22,6 @@ variables:
FDO_DISTRIBUTION_VERSION: rawhide FDO_DISTRIBUTION_VERSION: rawhide
FDO_UPSTREAM_REPO: "libfprint/$CI_PROJECT_NAME" FDO_UPSTREAM_REPO: "libfprint/$CI_PROJECT_NAME"
FEDORA_IMAGE: "$CI_REGISTRY/libfprint/$CI_PROJECT_NAME/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG" FEDORA_IMAGE: "$CI_REGISTRY/libfprint/$CI_PROJECT_NAME/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG"
BUNDLE: "org.freedesktop.libfprint.Demo.flatpak"
LAST_ABI_BREAK: "056ea541ddc97f5806cffbd99a12dc87e4da3546" LAST_ABI_BREAK: "056ea541ddc97f5806cffbd99a12dc87e4da3546"
workflow: workflow:
@@ -177,14 +176,18 @@ test_unsupported_list:
- tests/hwdb-check-unsupported.py - tests/hwdb-check-unsupported.py
flatpak: flatpak:
stage: flatpak #stage: flatpak
extends: .flatpak stage: image-build
extends: .flatpak@x86_64
# From https://gitlab.gnome.org/GNOME/gnome-runtime-images/container_registry # From https://gitlab.gnome.org/GNOME/gnome-runtime-images/container_registry
image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:42 image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/x86_64/gnome:42
variables: variables:
MANIFEST_PATH: "demo/org.freedesktop.libfprint.Demo.json" MANIFEST_PATH: "demo/org.freedesktop.libfprint.Demo.json"
FLATPAK_MODULE: "libfprint" FLATPAK_MODULE: "libfprint"
APP_ID: "org.freedesktop.libfprint.Demo" APP_ID: "org.freedesktop.libfprint.Demo"
BUNDLE: "org.freedesktop.libfprint.Demo.flatpak"
# Build with any builder
tags: []
rules: rules:
- if: '$CI_PROJECT_PATH != "libfprint/libfprint"' - if: '$CI_PROJECT_PATH != "libfprint/libfprint"'
when: never when: never