From 4e7b76344cb9e1797ba1b9866de483304afb53bd Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Fri, 18 Mar 2022 10:38:41 +0000 Subject: [PATCH] ci: Update mingw image to Fedora 34 Signed-off-by: Philip Withnall --- .gitlab-ci.yml | 2 +- .gitlab-ci/mingw.Dockerfile | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8b91bdde2..491d7d1bd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ variables: COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v3" DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v9" ANDROID_IMAGE: "registry.gitlab.gnome.org/gnome/glib/android-ndk:v5" - MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v4" + MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v5" MESON_TEST_TIMEOUT_MULTIPLIER: 2 G_MESSAGES_DEBUG: all MESON_COMMON_OPTIONS_NO_WARNING: "--buildtype debug --wrap-mode=nodownload" diff --git a/.gitlab-ci/mingw.Dockerfile b/.gitlab-ci/mingw.Dockerfile index 293d91a5d..eb773e0f1 100644 --- a/.gitlab-ci/mingw.Dockerfile +++ b/.gitlab-ci/mingw.Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:33 +FROM fedora:34 RUN dnf -y install \ bindfs \ @@ -8,7 +8,6 @@ RUN dnf -y install \ elfutils-libelf-devel \ findutils \ fuse \ - gamin-devel \ gcc \ gcc-c++ \ gettext \