[fractal] ci: Fix docs (again)



commit 1206d4ed12059a298b5d918fd0a77dca034f7084
Author: Kévin Commaille <zecakeh tedomum fr>
Date:   Thu May 12 13:13:37 2022 +0200

    ci: Fix docs (again)

 .gitlab-ci.yml  | 2 ++
 src/meson.build | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 394028cb7..1fcdb0ff7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -138,6 +138,8 @@ pages:
   tags:
     - flatpak
   script:
+    - flatpak install --user --noninteractive org.freedesktop.Sdk.Extension.rust-nightly//21.08
+    - 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}
     - mv .flatpak-builder/build/${FLATPAK_MODULE}/_flatpak_build/src/doc public
diff --git a/src/meson.build b/src/meson.build
index 03d0a5121..6e1597c3e 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -85,7 +85,7 @@ cargo_doc = custom_target(
     console: true,
     command: [
       'env', cargo_env + doc_env,
-      cargo, '+nightly', 'doc',
+      cargo, 'doc',
       cargo_options + doc_deps + ['--no-deps', '--document-private-items', '-Zrustdoc-map'] ,
     ],
   )


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]