diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1fcdb0ff..c13cc687 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ stages: variables: FLATPAK_MODULE: "fractal" RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo" - CI_IMAGE_X86_64: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/rust_bundle:master" + CI_IMAGE_X86_64: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:42" CI_IMAGE_AARCH64: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/aarch64:gnome-nightly" .hack: diff --git a/build-aux/org.gnome.Fractal.Devel.json b/build-aux/org.gnome.Fractal.Devel.json index 79a8168c..3a9ba93e 100644 --- a/build-aux/org.gnome.Fractal.Devel.json +++ b/build-aux/org.gnome.Fractal.Devel.json @@ -1,14 +1,14 @@ { - "app-id" : "org.gnome.Fractal.Devel", - "runtime" : "org.gnome.Platform", - "runtime-version" : "master", - "sdk" : "org.gnome.Sdk", - "sdk-extensions" : [ + "app-id": "org.gnome.Fractal.Devel", + "runtime": "org.gnome.Platform", + "runtime-version": "42", + "sdk": "org.gnome.Sdk", + "sdk-extensions": [ "org.freedesktop.Sdk.Extension.rust-stable", "org.freedesktop.Sdk.Extension.llvm12" ], - "command" : "fractal", - "finish-args" : [ + "command": "fractal", + "finish-args": [ "--socket=fallback-x11", "--socket=wayland", "--socket=pulseaudio", @@ -19,18 +19,18 @@ "--env=G_MESSAGES_DEBUG=none", "--env=RUST_BACKTRACE=1" ], - "build-options" : { + "build-options": { "append-ld-library-path": "/usr/lib/sdk/llvm12/lib", - "append-path" : "/usr/lib/sdk/llvm12/bin:/usr/lib/sdk/rust-stable/bin", - "build-args" : [ + "append-path": "/usr/lib/sdk/llvm12/bin:/usr/lib/sdk/rust-stable/bin", + "build-args": [ "--share=network" ], - "test-args" : [ + "test-args": [ "--socket=x11", "--share=network" ] }, - "modules" : [ + "modules": [ { "name": "libshumate", "buildsystem": "meson", @@ -48,18 +48,18 @@ ] }, { - "name" : "fractal", - "buildsystem" : "meson", - "run-tests" : true, - "config-opts" : [ + "name": "fractal", + "buildsystem": "meson", + "run-tests": true, + "config-opts": [ "-Dprofile=development" ], - "sources" : [ + "sources": [ { - "type" : "dir", - "path" : "../" + "type": "dir", + "path": "../" } ] } ] -} +} \ No newline at end of file diff --git a/build-aux/org.gnome.Fractal.Hack.json b/build-aux/org.gnome.Fractal.Hack.json index bf215f47..61930115 100644 --- a/build-aux/org.gnome.Fractal.Hack.json +++ b/build-aux/org.gnome.Fractal.Hack.json @@ -1,7 +1,7 @@ { "app-id": "org.gnome.Fractal.Hack", "runtime": "org.gnome.Platform", - "runtime-version": "master", + "runtime-version": "42", "sdk": "org.gnome.Sdk", "sdk-extensions": [ "org.freedesktop.Sdk.Extension.rust-stable",