From 7e6437334032d989c286f2f4dfd8d3d50430238f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Tue, 17 Sep 2024 12:35:09 +0200 Subject: [PATCH] ci: Use mold from rust-nightly extension in docs job --- .gitlab-ci/docs.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci/docs.yml b/.gitlab-ci/docs.yml index 7fe81af7..4b2b0bad 100644 --- a/.gitlab-ci/docs.yml +++ b/.gitlab-ci/docs.yml @@ -4,9 +4,9 @@ - flatpak script: - 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} + # We want to use rust-nightly to build the app. + - sed -i 's|"org.freedesktop.Sdk.Extension.rust-stable"|"org.freedesktop.Sdk.Extension.rust-nightly"|g' ${MANIFEST_PATH} + - sed -i 's|/rust-stable/bin|/rust-nightly/extra/sdk/rust-nightly/bin|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} - mv .flatpak-builder/build/${FLATPAK_MODULE}/_flatpak_build/src/doc ${DOCS_FOLDER}