summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2023-02-18 00:27:04 +0000
committerMatthias Clasen <mclasen@redhat.com>2023-02-18 00:27:04 +0000
commit13cd53498bff11c80f993c6aa42db9a066d81fe0 (patch)
tree1cd1c88be3a62abae8e7aba4b1df2f9c568808d6
parentf28588f3ff56cec3bd4a0e3ec3ebb02f2e353634 (diff)
parent1b9947d58f76ab06978549120e318d3571945152 (diff)
downloadpango-13cd53498bff11c80f993c6aa42db9a066d81fe0.tar.gz
Merge branch 'update-ci' into 'main'
ci: Add new gi-docgen deps to the image See merge request GNOME/pango!679
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--.gitlab-ci/fedora.Dockerfile2
2 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index af18fc3a..8610f7ab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ stages:
variables:
COMMON_MESON_FLAGS: "--fatal-meson-warnings --werror"
MESON_TEST_TIMEOUT_MULTIPLIER: 2
- FEDORA_IMAGE: registry.gitlab.gnome.org/gnome/pango/fedora:v10
+ FEDORA_IMAGE: registry.gitlab.gnome.org/gnome/pango/fedora:v11
.only-default:
only:
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index dbf85908..1d453561 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -36,8 +36,10 @@ RUN dnf -y install \
meson \
ninja-build \
python3 \
+ python3-docutils \
python3-jinja2 \
python3-markdown \
+ python3-packaging \
python3-pip \
python3-pygments \
python3-toml \