diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cc2b1fdb..1401954d 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: "quay.io/gnome_infrastructure/gnome-runtime-images:gnome-42" + CI_IMAGE: "quay.io/gnome_infrastructure/gnome-runtime-images:gnome-master" .hack: variables: diff --git a/build-aux/org.gnome.Fractal.Devel.json b/build-aux/org.gnome.Fractal.Devel.json index 3a9ba93e..a922fcc7 100644 --- a/build-aux/org.gnome.Fractal.Devel.json +++ b/build-aux/org.gnome.Fractal.Devel.json @@ -1,11 +1,11 @@ { "app-id": "org.gnome.Fractal.Devel", "runtime": "org.gnome.Platform", - "runtime-version": "42", + "runtime-version": "master", "sdk": "org.gnome.Sdk", "sdk-extensions": [ "org.freedesktop.Sdk.Extension.rust-stable", - "org.freedesktop.Sdk.Extension.llvm12" + "org.freedesktop.Sdk.Extension.llvm14" ], "command": "fractal", "finish-args": [ @@ -20,8 +20,8 @@ "--env=RUST_BACKTRACE=1" ], "build-options": { - "append-ld-library-path": "/usr/lib/sdk/llvm12/lib", - "append-path": "/usr/lib/sdk/llvm12/bin:/usr/lib/sdk/rust-stable/bin", + "append-ld-library-path": "/usr/lib/sdk/llvm14/lib", + "append-path": "/usr/lib/sdk/llvm14/bin:/usr/lib/sdk/rust-stable/bin", "build-args": [ "--share=network" ], @@ -62,4 +62,4 @@ ] } ] -} \ 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 61930115..c0052365 100644 --- a/build-aux/org.gnome.Fractal.Hack.json +++ b/build-aux/org.gnome.Fractal.Hack.json @@ -1,11 +1,11 @@ { "app-id": "org.gnome.Fractal.Hack", "runtime": "org.gnome.Platform", - "runtime-version": "42", + "runtime-version": "master", "sdk": "org.gnome.Sdk", "sdk-extensions": [ "org.freedesktop.Sdk.Extension.rust-stable", - "org.freedesktop.Sdk.Extension.llvm12" + "org.freedesktop.Sdk.Extension.llvm14" ], "command": "fractal", "finish-args": [ @@ -20,8 +20,8 @@ "--env=RUST_BACKTRACE=1" ], "build-options": { - "append-ld-library-path": "/usr/lib/sdk/llvm12/lib", - "append-path": "/usr/lib/sdk/llvm12/bin:/usr/lib/sdk/rust-stable/bin", + "append-ld-library-path": "/usr/lib/sdk/llvm14/lib", + "append-path": "/usr/lib/sdk/llvm14/bin:/usr/lib/sdk/rust-stable/bin", "env": { "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER": "clang", "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS": "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold --cfg=ruma_identifiers_storage=\"Arc\"", @@ -68,4 +68,4 @@ ] } ] -} \ No newline at end of file +}