summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2021-12-16 03:30:25 +0000
committerMatthias Clasen <mclasen@redhat.com>2021-12-16 03:30:25 +0000
commit8b63dd7081fb8241718317f9e32773494a3a7be5 (patch)
tree3942c4634a0832e0106a6070e91fa453d94d3e36
parent88ffeea0dacce23fd92a84ebc41ed8af82d75ac6 (diff)
parent642b40e1e4ec0e7be36d905e2122dd891dd8a0de (diff)
downloadpango-8b63dd7081fb8241718317f9e32773494a3a7be5.tar.gz
Merge branch 'update-1-48-ci' into 'pango-1-48'
ci: Rebase the image to Fedora 34 (pango-1-48 branch) See merge request GNOME/pango!550
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--.gitlab-ci/fedora.Dockerfile5
2 files changed, 3 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3b9f5200..e93f7dea 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:v6
+ FEDORA_IMAGE: registry.gitlab.gnome.org/gnome/pango/fedora:v8
.only-default:
only:
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index ebb1e6b5..8db2643b 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:33
+FROM fedora:34
RUN dnf -y install \
abattis-cantarell-fonts \
@@ -32,6 +32,7 @@ RUN dnf -y install \
libubsan \
libXft-devel \
llvm \
+ meson \
ninja-build \
python3 \
python3-jinja2 \
@@ -45,8 +46,6 @@ RUN dnf -y install \
thai-scalable-waree-fonts \
&& dnf clean all
-RUN pip3 install meson==0.56
-
ARG HOST_USER_ID=5555
ENV HOST_USER_ID ${HOST_USER_ID}
RUN useradd -u $HOST_USER_ID -ms /bin/bash user