Merge branch 'update-ci-docgen' into 'master'

CI: Update packages in Docker image

See merge request GNOME/gtksourceview!307

2 files changed, 12 insertions, 12 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 29a12e85..9d46f3b7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,6 @@ reference:
     variables:
         MESON_FLAGS: "-Dc_std=c11 -Dcpp_std=c++11 -Dwerror=true --buildtype=release -Dglib:tests=false -Dgtk:media-gstreamer=disabled -Dgtk:broadway-backend=false -Dgtk:demos=false -Dgtk:build-examples=false -Dgtk:build-tests=false -Dgtk:werror=false -Dlibsass:werror=false -Dsassc:werror=false -Dlibadwaita:werror=false"
     script:
-        - sudo dnf -y install git libpng-devel libjpeg-turbo-devel expat-devel
         - mkdir -p pfx/
         - meson ${MESON_FLAGS} --prefix=${PWD}/pfx -Dgtk_doc=true _build
         - ninja -C _build install
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index 26c4ab9d..4cfdeaf1 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -1,20 +1,24 @@
 FROM fedora:36
 
 RUN dnf update -y
-RUN dnf -y install \
+RUN dnf -y install --setopt=install_weak_deps=False \
+    clang \
+    git \
+    gi-docgen \
     meson \
-    vala \
-    libvala-devel \
-    gtk4-devel \
     ninja-build \
     pkgconf \
-    clang \
+    vala \
+    expat-devel \
+    gtk4-devel \
     gobject-introspection-devel \
+    libjpeg-turbo-devel \
+    libpng-devel \
+    libvala-devel \
+    sysprof-devel \
     vulkan-headers \
-    python3-pip \
     wayland-devel \
-    wayland-protocols-devel \
-    sysprof-devel
+    wayland-protocols-devel
 
 RUN dnf clean all
 
@@ -28,7 +32,4 @@ RUN useradd -u $HOST_USER_ID -G wheel -ms /bin/bash user
 USER user
 WORKDIR /home/user
 
-ENV PATH="/home/user/.local/bin:${PATH}"
-RUN pip3 install --user --upgrade gi-docgen
-
 ENV LANG C.UTF-8