ci: Bump Fedora base image

F31 is EOL and no longer satisfies our ATK dependency. Bump it to
F35 to get gtk3's CI into a working state again.
This commit is contained in:
Florian Müllner 2022-06-17 17:47:45 +02:00
parent 04fe1c8e4e
commit fa8135d58a
2 changed files with 6 additions and 6 deletions

View File

@ -7,13 +7,13 @@ cache:
- _ccache/
fedora-autotools:
image: registry.gitlab.gnome.org/gnome/gtk/fedora-gtk3:v1
image: registry.gitlab.gnome.org/gnome/gtk/fedora-gtk3:v35
stage: build
script:
- bash -x ./.gitlab-ci/test-docker-autotools.sh
fedora-distcheck:
image: registry.gitlab.gnome.org/gnome/gtk/fedora-gtk3:v1
image: registry.gitlab.gnome.org/gnome/gtk/fedora-gtk3:v35
variables:
DO_DISTCHECK: "yes"
when: manual
@ -22,7 +22,7 @@ fedora-distcheck:
- bash -x ./.gitlab-ci/test-docker-autotools.sh
fedora-meson:
image: registry.gitlab.gnome.org/gnome/gtk/fedora-gtk3:v1
image: registry.gitlab.gnome.org/gnome/gtk/fedora-gtk3:v35
stage: build
variables:
EXTRA_MESON_FLAGS: "-Ddefault_library=both"
@ -50,7 +50,7 @@ debian-meson:
- "_build/testsuite/reftests/output"
reference:
image: registry.gitlab.gnome.org/gnome/gtk/fedora-gtk3:v1
image: registry.gitlab.gnome.org/gnome/gtk/fedora-gtk3:v35
stage: docs
variables:
EXTRA_MESON_FLAGS: "--buildtype=release -Dgtk_doc=true -Dman=true"

View File

@ -1,4 +1,4 @@
FROM fedora:31
FROM fedora:35
RUN dnf -y install \
adwaita-icon-theme \
@ -44,7 +44,7 @@ RUN dnf -y install \
libXtst-devel \
make \
mesa-libEGL-devel \
mesa-libwayland-egl-devel \
'pkgconfig(wayland-egl)' \
meson \
ninja-build \
pango-devel \