From b10baf02ea8b27a06198ce2ee6fc2b923fe20189 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 16 Aug 2022 15:11:44 +0200 Subject: [PATCH] flatpak: Build Flatpak using GNOME 42 So the old meson in the 3.36 runtime doesn't choke on: tests/meson.build:46:7: ERROR: Unknown method "project_source_root" in object. --- .gitlab-ci.yml | 3 ++- demo/org.freedesktop.libfprint.Demo.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 27d71d10..04121464 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -136,7 +136,8 @@ test_unsupported_list: flatpak: stage: flatpak extends: .flatpak - image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.36 + # From https://gitlab.gnome.org/GNOME/gnome-runtime-images/container_registry + image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:42 variables: MANIFEST_PATH: "demo/org.freedesktop.libfprint.Demo.json" FLATPAK_MODULE: "libfprint" diff --git a/demo/org.freedesktop.libfprint.Demo.json b/demo/org.freedesktop.libfprint.Demo.json index b6ab165d..9fc6dbe8 100644 --- a/demo/org.freedesktop.libfprint.Demo.json +++ b/demo/org.freedesktop.libfprint.Demo.json @@ -1,7 +1,7 @@ { "app-id": "org.freedesktop.libfprint.Demo", "runtime": "org.gnome.Platform", - "runtime-version": "3.36", + "runtime-version": "42", "sdk": "org.gnome.Sdk", "command": "gtk-libfprint-test", "finish-args": [