[gtk/ci-fedora-33] ci: Update the Fedora image to F33
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/ci-fedora-33] ci: Update the Fedora image to F33
- Date: Fri, 12 Feb 2021 03:03:30 +0000 (UTC)
commit 0a3fa409238ee5cc8283829f3b1db258e66f9165
Author: Matthias Clasen <mclasen redhat com>
Date: Thu Feb 11 22:02:39 2021 -0500
ci: Update the Fedora image to F33
.gitlab-ci.yml | 2 +-
.gitlab-ci/fedora-base.Dockerfile | 7 ++-----
.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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]