ci: Build flatpak using gnome master

Also bump dependencies versions
This commit is contained in:
Marco Trevisan (Treviño)
2023-09-27 17:18:42 +02:00
parent 26d2c77c3d
commit efba965b0c
2 changed files with 9 additions and 10 deletions

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/21e7c107/flatpak/flatpak_ci_initiative.yml' - remote: 'https://gitlab.gnome.org/GNOME/citemplates/-/raw/master/flatpak/flatpak_ci_initiative.yml'
default: default:
# Auto-retry jobs in case of infra failures # Auto-retry jobs in case of infra failures
@@ -178,13 +178,12 @@ test_unsupported_list:
flatpak: flatpak:
stage: flatpak stage: flatpak
extends: .flatpak@x86_64 extends: .flatpak@x86_64
# From https://gitlab.gnome.org/GNOME/gnome-runtime-images/container_registry
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" BUNDLE: "org.freedesktop.libfprint.Demo.flatpak"
RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo"
# Build with any builder # Build with any builder
tags: [] tags: []
rules: rules:

View File

@@ -1,7 +1,7 @@
{ {
"app-id": "org.freedesktop.libfprint.Demo", "app-id": "org.freedesktop.libfprint.Demo",
"runtime": "org.gnome.Platform", "runtime": "org.gnome.Platform",
"runtime-version": "42", "runtime-version": "master",
"sdk": "org.gnome.Sdk", "sdk": "org.gnome.Sdk",
"command": "gtk-libfprint-test", "command": "gtk-libfprint-test",
"finish-args": [ "finish-args": [
@@ -38,24 +38,24 @@
{ {
"name": "libgusb", "name": "libgusb",
"buildsystem": "meson", "buildsystem": "meson",
"config-opts": [ "-Dtests=false", "-Dvapi=false", "-Ddocs=false", "-Dintrospection=false" ], "config-opts": [ "-Dtests=false", "-Dvapi=false", "-Ddocs=false" ],
"sources": [ "sources": [
{ {
"type": "archive", "type": "archive",
"url": "https://github.com/hughsie/libgusb/archive/0.3.0.tar.gz", "url": "https://github.com/hughsie/libgusb/releases/download/0.4.6/libgusb-0.4.6.tar.xz",
"sha256": "b36310f8405d5fd68f6caf4a829f7ab4c627b38fd3d02a139d411fce0f3a49f1" "sha256": "1b0422bdcd72183272ac42eec9398c5a0bc48a02f618fa3242c468cbbd003049"
} }
] ]
}, },
{ {
"name": "gudev", "name": "gudev",
"buildsystem": "meson", "buildsystem": "meson",
"config-opts": [ "-Dtests=disabled", "-Dintrospection=disabled" ], "config-opts": [ "-Dtests=disabled", "-Dintrospection=disabled", "-Dvapi=disabled" ],
"sources": [ "sources": [
{ {
"type": "archive", "type": "archive",
"url": "https://download.gnome.org/sources/libgudev/236/libgudev-236.tar.xz", "url": "https://download.gnome.org/sources/libgudev/238/libgudev-238.tar.xz",
"sha256": "e50369d06d594bae615eb7aeb787de304ebaad07a26d1043cef8e9c7ab7c9524" "sha256": "61266ab1afc9d73dbc60a8b2af73e99d2fdff47d99544d085760e4fa667b5dd1"
} }
] ]
}, },