diff --git a/.gitlab-ci/docs.yml b/.gitlab-ci/docs.yml index ae7170a8..7fe81af7 100644 --- a/.gitlab-ci/docs.yml +++ b/.gitlab-ci/docs.yml @@ -3,7 +3,7 @@ tags: - flatpak script: - - flatpak install --user --noninteractive org.freedesktop.Sdk.Extension.rust-nightly//24.08beta + - flatpak install --user --noninteractive org.freedesktop.Sdk.Extension.rust-nightly//24.08 # We want to use rust-nightly to build the app, but mold is in rust-stable - sed -i 's|"org.freedesktop.Sdk.Extension.rust-stable"|"org.freedesktop.Sdk.Extension.rust-stable","org.freedesktop.Sdk.Extension.rust-nightly"|g' ${MANIFEST_PATH} - sed -i 's|:/usr/lib/sdk/rust-stable/bin|:/usr/lib/sdk/rust-nightly/extra/sdk/rust-nightly/bin|g' ${MANIFEST_PATH} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5044970f..73468590 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -34,22 +34,22 @@ If you're building Fractal with Flatpak (via GNOME Builder or the command line), manually add the necessary remotes and install the required freedesktop.org extensions: ```sh -# Add Flathub beta and the gnome-nightly repo -flatpak remote-add --user --if-not-exists flathub-beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo +# Add Flathub and the gnome-nightly repo +flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo flatpak remote-add --user --if-not-exists gnome-nightly https://nightly.gnome.org/gnome-nightly.flatpakrepo # Install the gnome-nightly Sdk and Platform runtime flatpak install --user gnome-nightly org.gnome.Sdk//master org.gnome.Platform//master -# Install the required rust-stable extension from Flathub beta -flatpak install --user flathub-beta org.freedesktop.Sdk.Extension.rust-stable//24.08beta +# Install the required rust-stable extension from Flathub +flatpak install --user flathub org.freedesktop.Sdk.Extension.rust-stable//24.08 -# Install the required llvm extension from Flathub beta -flatpak install --user flathub-beta org.freedesktop.Sdk.Extension.llvm18//24.08beta +# Install the required llvm extension from Flathub +flatpak install --user flathub org.freedesktop.Sdk.Extension.llvm18//24.08 ``` If you are building the flatpak manually you will also need flatpak-builder on your system, or the -`org.flatpak.Builder` flatpak. +`org.flatpak.Builder` flatpak from Flathub. ### GNOME Builder