diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-02-12 13:46:14 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-02-12 13:46:14 +0000 |
| commit | bcfca52e9e934dd43c7a4448dbbe25afbe97e6d2 (patch) | |
| tree | 5dd7beef75a7427572f3139c4727a131181b6dd5 | |
| parent | 919e06a8319e46b949536df4b4b6900442ca0122 (diff) | |
| parent | 0a3fa409238ee5cc8283829f3b1db258e66f9165 (diff) | |
| download | gtk+-bcfca52e9e934dd43c7a4448dbbe25afbe97e6d2.tar.gz | |
Merge branch 'ci-fedora-33' into 'master'
ci: Update the Fedora image to F33
See merge request GNOME/gtk!3188
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci/fedora-base.Dockerfile | 7 | ||||
| -rw-r--r-- | .gitlab-ci/fedora.Dockerfile | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6c6d15c8a7..8476616092 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ variables: BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true" FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled" MESON_TEST_TIMEOUT_MULTIPLIER: 3 - FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v27" + FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v28" FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master" DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v25" diff --git a/.gitlab-ci/fedora-base.Dockerfile b/.gitlab-ci/fedora-base.Dockerfile index 613d492d34..04377f05e5 100644 --- a/.gitlab-ci/fedora-base.Dockerfile +++ b/.gitlab-ci/fedora-base.Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:31 +FROM fedora:33 RUN dnf -y install \ adwaita-icon-theme \ @@ -66,7 +66,7 @@ RUN dnf -y install \ mesa-dri-drivers \ mesa-libEGL-devel \ mesa-libGLES-devel \ - mesa-libwayland-egl-devel \ + meson \ ninja-build \ pango-devel \ pcre-devel \ @@ -87,6 +87,3 @@ RUN dnf -y install \ which \ xorg-x11-server-Xvfb \ && dnf clean all - -RUN pip3 install meson==0.55.3 - diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile index ddcc18f287..c64f0947b7 100644 --- a/.gitlab-ci/fedora.Dockerfile +++ b/.gitlab-ci/fedora.Dockerfile @@ -1,4 +1,4 @@ -FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v27 +FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v28 # Enable sudo for wheel users RUN sed -i -e 's/# %wheel/%wheel/' -e '0,/%wheel/{s/%wheel/# %wheel/}' /etc/sudoers |