[libadwaita/wip/exalm/bump-gtk: 34/37] ci: Refresh the docs image




commit 2c406b113a09f49e7598d46c0ac559618a4ce593
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Tue Aug 31 12:22:36 2021 +0500

    ci: Refresh the docs image
    
    Build gtk manually isntead of relying on the f34 one. Unfortunately, f35
    fails with weird pkg-config issues, so we have to stay on f34 for now.
    
    Trim down the packages as well, it still had all the gtk-doc deps.
    
    Bump the tag to v2.

 .gitlab-ci.yml             |  2 +-
 .gitlab-ci/docs.Dockerfile | 28 ++++++++++++----------------
 2 files changed, 13 insertions(+), 17 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c416bb77..568b2000 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ variables:
   FLATPAK_MODULE: 'libadwaita'
   FLATPAK_BUILD_DIR: build
   ABI_CHECKER_IMAGE: "registry.gitlab.gnome.org/gnome/libadwaita/abi-checker:v1"
-  DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/libadwaita/docs:v1"
+  DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/libadwaita/docs:v2"
 
 stages:
   - build
diff --git a/.gitlab-ci/docs.Dockerfile b/.gitlab-ci/docs.Dockerfile
index b46ddb1a..3f1bc144 100644
--- a/.gitlab-ci/docs.Dockerfile
+++ b/.gitlab-ci/docs.Dockerfile
@@ -2,22 +2,18 @@ FROM fedora:34
 
 RUN dnf -y update \
  && dnf -y install \
-    @development-tools \
-    dnf-plugins-core \
-    gcc \
+    "dnf-command(builddep)" \
     git \
-    gobject-introspection-devel \
-    gtk4-devel \
-    meson \
-    pcre-static \
-    python3 \
-    python3-jinja2 \
-    python3-markdown \
-    python3-pip \
-    python3-pygments \
-    python3-toml \
-    python3-typogrify \
-    python3-wheel \
-    redhat-rpm-config \
+    libjpeg-turbo-devel \
     sassc \
+ && sudo dnf -y build-dep gtk4 \
  && dnf clean all
+
+RUN git clone https://gitlab.gnome.org/GNOME/gtk.git --depth=1 \
+ && cd gtk \
+ && meson build --prefix=/usr \
+ && cd build \
+ && ninja \
+ && sudo ninja install \
+ && cd ../.. \
+ && rm -rf gtk


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