diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9d482fbd..4320cd34 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ stages: - test flatpak: - image: 'registry.gitlab.gnome.org/gnome/gnome-runtime-images/rust_bundle:3.38' + image: 'registry.gitlab.gnome.org/gnome/gnome-runtime-images/rust_bundle:master' stage: test tags: - flatpak diff --git a/build-aux/org.gnome.FractalNext.Devel.json b/build-aux/org.gnome.FractalNext.Devel.json index 2ce2d156..340f4245 100644 --- a/build-aux/org.gnome.FractalNext.Devel.json +++ b/build-aux/org.gnome.FractalNext.Devel.json @@ -1,7 +1,7 @@ { "app-id": "org.gnome.FractalNext.Devel", "runtime": "org.gnome.Platform", - "runtime-version": "3.38", + "runtime-version": "master", "sdk": "org.gnome.Sdk", "sdk-extensions": ["org.freedesktop.Sdk.Extension.rust-stable"], "command": "fractal", @@ -29,65 +29,6 @@ } }, "modules": [ - { - "name": "gtk4", - "buildsystem": "meson", - "config-opts": [ - "-Ddemos=false", - "-Dbuild-examples=false", - "-Dbuild-tests=false" - ], - "sources": [ - { - "type": "archive", - "url": "https://download.gnome.org/sources/gtk/4.0/gtk-4.0.0.tar.xz", - "sha256": "d46cf5b127ea27dd9e5d2ff6ed500cb4067eeb2cb1cd2c313ccde8013b0b9bf9" - } - ], - "modules": [ - { - "name": "pango", - "buildsystem": "meson", - "sources": [ - { - "type": "archive", - "url": "https://download.gnome.org/sources/pango/1.48/pango-1.48.0.tar.xz", - "sha256": "391f26f3341c2d7053e0fb26a956bd42360dadd825efe7088b1e9340a65e74e6" - } - ] - }, - { - "name": "libsass", - "sources": [ - { - "type": "archive", - "url": "https://github.com/sass/libsass/archive/3.6.4.tar.gz", - "sha256": "f9484d9a6df60576e791566eab2f757a97fd414fce01dd41fc0a693ea5db2889" - }, - { - "type": "script", - "dest-filename": "autogen.sh", - "commands": ["autoreconf -si"] - } - ] - }, - { - "name": "sassc", - "sources": [ - { - "type": "archive", - "url": "https://github.com/sass/sassc/archive/3.6.1.tar.gz", - "sha256": "8cee391c49a102b4464f86fc40c4ceac3a2ada52a89c4c933d8348e3e4542a60" - }, - { - "type": "script", - "dest-filename": "autogen.sh", - "commands": ["autoreconf -si"] - } - ] - } - ] - }, { "name": "libadwaita", "buildsystem": "meson",