diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e205844..c81572b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,7 @@ variables: BUNDLE: "org.gnome.Loupe.Devel.flatpak" MANIFEST_PATH: "build-aux/flatpak/org.gnome.Loupe.Devel.json" FLATPAK_MODULE: "loupe" - FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/rust_bundle:master" + FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:42" .flatpak_cache_template: &flatpak_cache cache: diff --git a/build-aux/flatpak/org.gnome.Loupe.Devel.json b/build-aux/flatpak/org.gnome.Loupe.Devel.json index 57dc727..703f1db 100644 --- a/build-aux/flatpak/org.gnome.Loupe.Devel.json +++ b/build-aux/flatpak/org.gnome.Loupe.Devel.json @@ -1,7 +1,7 @@ { "app-id" : "org.gnome.Loupe.Devel", "runtime" : "org.gnome.Platform", - "runtime-version" : "master", + "runtime-version" : "42", "sdk" : "org.gnome.Sdk", "sdk-extensions" : [ "org.freedesktop.Sdk.Extension.rust-stable" @@ -35,6 +35,23 @@ "*.a" ], "modules" : [ + { + "name" : "libadwaita", + "buildsystem" : "meson", + "config-opts" : [ + "-Dtests=false", + "-Dexamples=false", + "-Dvapi=false", + "-Dintrospection=disabled" + ], + "sources" : [ + { + "type" : "git", + "url" : "https://gitlab.gnome.org/GNOME/libadwaita.git", + "branch" : "main" + } + ] + }, { "name" : "loupe", "builddir" : true,