diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-12-10 11:57:39 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-12-10 11:57:39 -0500 |
| commit | 7b10afbde9278ba153609f4567179b9309f70090 (patch) | |
| tree | 85e0802e6511812879ed623f087699842e466cc8 | |
| parent | d629c9c9de5d67c06a80be7cb5ce9b749b2d9ead (diff) | |
| download | pango-bump-ci-image.tar.gz | |
ci: Rebase the image to Fedora 34bump-ci-image
This gives us a newer meson, among other things.
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci/fedora.Dockerfile | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6195501c..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:v7 + 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 e905deee..a7600b46 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 \ @@ -33,6 +33,7 @@ RUN dnf -y install \ libubsan \ libXft-devel \ llvm \ + meson \ ninja-build \ python3 \ python3-jinja2 \ @@ -46,8 +47,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 |