[glib/wip/pwithnall/update-fedora-ci] ci: Update the Fedora CI image to Fedora 34
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/wip/pwithnall/update-fedora-ci] ci: Update the Fedora CI image to Fedora 34
- Date: Tue, 8 Mar 2022 12:59:00 +0000 (UTC)
commit 61c45bea86bd923c461f299adcc8e067c00f53ab
Author: Philip Withnall <pwithnall endlessos org>
Date: Tue Mar 8 12:57:27 2022 +0000
ci: Update the Fedora CI image to Fedora 34
This is the oldest still-supported version of Fedora.
It no longer ships gamin.
This should fix the installed-tests, which rely on version 0.19 of
python-dbusmock. Fedora 33 only had 0.18.
Signed-off-by: Philip Withnall <pwithnall endlessos org>
.gitlab-ci.yml | 2 +-
.gitlab-ci/fedora.Dockerfile | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a77836e5b..7ea9b87b8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,7 @@ cache:
- _ccache/
variables:
- FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v12"
+ FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v13"
COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v2"
DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v9"
ANDROID_IMAGE: "registry.gitlab.gnome.org/gnome/glib/android-ndk:v5"
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index 07569aea0..deaa7c74e 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:33
+FROM fedora:34
RUN dnf -y update \
&& dnf -y install \
@@ -11,7 +11,6 @@ RUN dnf -y update \
elfutils-libelf-devel \
findutils \
fuse \
- gamin-devel \
gcc \
gcc-c++ \
gettext \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]