From c797001d7b32e52c006173f0a5cea7a651480d91 Mon Sep 17 00:00:00 2001
From: Veli Tasali <veli.tasali@gmail.com>
Date: Sat, 24 Apr 2021 18:08:53 +0300
Subject: [PATCH 1/2] ci: docs: Publish on GitLab Pages

This makes necessary changes to the CI
configuration to publish docs on GitLab Pages.
---
 .gitlab-ci.yml | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4320cd341..496435a63 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,3 +37,36 @@ rustfmt:
     - rustc -Vv && cargo -Vv
     - cargo fmt --version
     - cargo fmt --all -- --color=always --check
+
+pages:
+  image: "ghcr.io/gtk-rs/gtk4-rs/gtk4:latest"
+  variables:
+    RUSTDOCFLAGS: >
+      -Z unstable-options
+      --extern-html-root-url=gio=https://gtk-rs.org/gtk-rs/git/docs
+      --extern-html-root-url=gsk4=https://gtk-rs.org/gtk4-rs/git/docs
+      --extern-html-root-url=gdk4=https://gtk-rs.org/gtk4-rs/git/docs
+      --extern-html-root-url=gtk4=https://gtk-rs.org/gtk4-rs/git/docs
+      --extern-html-root-url=glib=https://gtk-rs.org/gtk-rs/git/docs
+      --extern-html-root-url=libadwaita=https://world.pages.gitlab.gnome.org/Rust/libadwaita-rs/libadwaita/
+      --extern-html-root-url=matrix-sdk=https://docs.rs/matrix-sdk
+  script:
+    # generate the docs
+    - dnf update -y
+    - dnf install -y openssl-devel cmake
+    - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain nightly
+    - git clone https://gitlab.gnome.org/GNOME/libadwaita.git
+    - cd libadwaita
+    - meson _build --prefix=/usr -Dvapi=false
+    - ninja -C _build install
+    - cd ..
+    - source $HOME/.cargo/env
+    - meson _build --prefix=/usr
+    - cargo doc -p fractal --no-deps
+    - mv target/doc/ public
+  artifacts:
+    paths:
+      - public
+  only:
+    refs:
+      - fractal-next
-- 
GitLab


From a5b5055ab06050b0bf6a97f3eec17050b952ea32 Mon Sep 17 00:00:00 2001
From: Veli Tasali <veli.tasali@gmail.com>
Date: Thu, 29 Apr 2021 00:05:45 +0300
Subject: [PATCH 2/2] docs: Set crate logo as the FractalNext icon

This replaces the default Rust logo as the app
icon on all documentation pages under `fractal`
package.
---
 src/main.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main.rs b/src/main.rs
index 4a3e1a43f..d29c9b87c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,3 +1,7 @@
+#![doc(
+    html_logo_url = "https://gitlab.gnome.org/GNOME/fractal/-/raw/fractal-next/data/icons/org.gnome.FractalNext.svg?inline=false"
+)]
+
 mod application;
 #[rustfmt::skip]
 mod config;
-- 
GitLab