From 93412a754f0209df5dd121f997e334beb182ac5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Thu, 22 Jun 2023 10:20:56 +0200 Subject: [PATCH] chore: Update Flatpak SDK extensions for 23.08beta --- .gitlab-ci.yml | 2 +- CONTRIBUTING.md | 4 ++-- build-aux/org.gnome.Fractal.Devel.json | 6 +++--- build-aux/org.gnome.Fractal.Hack.json | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index da4948fa..a4a51594 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,7 +86,7 @@ pages: tags: - flatpak script: - - flatpak install --user --noninteractive org.freedesktop.Sdk.Extension.rust-nightly//22.08 + - flatpak install --user --noninteractive org.freedesktop.Sdk.Extension.rust-nightly//23.08beta - sed -i 's|rust-stable|rust-nightly|g' ${MANIFEST_PATH} - flatpak-builder --keep-build-dirs --user --disable-rofiles-fuse --stop-at=${FLATPAK_MODULE} flatpak_app --repo=repo ${BRANCH:+--default-branch=$BRANCH} ${MANIFEST_PATH} - echo "ninja src/doc" | flatpak-builder --disable-rofiles-fuse --build-shell=${FLATPAK_MODULE} flatpak_app ${MANIFEST_PATH} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 300c8bf1..dbe988eb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -37,10 +37,10 @@ flatpak remote-add --user --if-not-exists gnome-nightly https://nightly.gnome.or flatpak install --user gnome-nightly org.gnome.Sdk//master org.gnome.Platform//master # Install the required rust-stable extension from Flathub -flatpak install --user flathub org.freedesktop.Sdk.Extension.rust-stable//22.08 +flatpak install --user flathub org.freedesktop.Sdk.Extension.rust-stable//23.08beta # Install the required llvm extension from Flathub -flatpak install --user flathub org.freedesktop.Sdk.Extension.llvm15//22.08 +flatpak install --user flathub org.freedesktop.Sdk.Extension.llvm16//23.08beta ``` If you are building the flatpak manually you will also need flatpak-builder on your system, or the diff --git a/build-aux/org.gnome.Fractal.Devel.json b/build-aux/org.gnome.Fractal.Devel.json index eba85e71..d4df93d4 100644 --- a/build-aux/org.gnome.Fractal.Devel.json +++ b/build-aux/org.gnome.Fractal.Devel.json @@ -5,7 +5,7 @@ "sdk": "org.gnome.Sdk", "sdk-extensions": [ "org.freedesktop.Sdk.Extension.rust-stable", - "org.freedesktop.Sdk.Extension.llvm15" + "org.freedesktop.Sdk.Extension.llvm16" ], "command": "fractal", "finish-args": [ @@ -20,8 +20,8 @@ "--env=RUST_BACKTRACE=1" ], "build-options": { - "append-ld-library-path": "/usr/lib/sdk/llvm15/lib", - "append-path": "/usr/lib/sdk/llvm15/bin:/usr/lib/sdk/rust-stable/bin", + "append-ld-library-path": "/usr/lib/sdk/llvm16/lib", + "append-path": "/usr/lib/sdk/llvm16/bin:/usr/lib/sdk/rust-stable/bin", "build-args": [ "--share=network" ], diff --git a/build-aux/org.gnome.Fractal.Hack.json b/build-aux/org.gnome.Fractal.Hack.json index 34638f83..a838ba5e 100644 --- a/build-aux/org.gnome.Fractal.Hack.json +++ b/build-aux/org.gnome.Fractal.Hack.json @@ -5,7 +5,7 @@ "sdk": "org.gnome.Sdk", "sdk-extensions": [ "org.freedesktop.Sdk.Extension.rust-stable", - "org.freedesktop.Sdk.Extension.llvm15" + "org.freedesktop.Sdk.Extension.llvm16" ], "command": "fractal", "finish-args": [ @@ -20,8 +20,8 @@ "--env=RUST_BACKTRACE=1" ], "build-options": { - "append-ld-library-path": "/usr/lib/sdk/llvm15/lib", - "append-path": "/usr/lib/sdk/llvm15/bin:/usr/lib/sdk/rust-stable/bin", + "append-ld-library-path": "/usr/lib/sdk/llvm16/lib", + "append-path": "/usr/lib/sdk/llvm16/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\"",