From aa9a861225c3311c87fe9f23e88bd9659e084e16 Mon Sep 17 00:00:00 2001
From: Luca Bacci <luca.bacci982@gmail.com>
Date: Mon, 20 Oct 2025 10:50:33 +0200
Subject: [PATCH 1/2] Revert "ci: Temporarily disable msys2-mingw32 CI"

This reverts commit 558a34d619a223fb2448a381fd682eee579716d7.
---
 .gitlab-ci.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c904a1761..bce09f3c3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -562,10 +562,6 @@ cross-mingw64:
 # This policy doesn’t apply to intermittent flaky test failures, only to
 # consistent build failures caused by changed dependencies or build environment.
 msys2-mingw32:
-  # FIXME: Currently disabled because it’s too flaky and keeps failing with
-  # subproject fetch errors
-  # See https://gitlab.gnome.org/GNOME/glib/-/issues/3715
-  when: manual
   extends: .only-default-and-merges
   stage: build
   tags:

From 93c88847615fb36dabd68c9bca6d2e7f4feca3a1 Mon Sep 17 00:00:00 2001
From: Luca Bacci <luca.bacci982@gmail.com>
Date: Fri, 17 Oct 2025 14:54:51 +0200
Subject: [PATCH 2/2] CI/MSYS2: Set GitLab submodule strategy to recursive

Workaround for #3715
---
 .gitlab-ci.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bce09f3c3..447d52cf1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -568,6 +568,8 @@ msys2-mingw32:
     - win32-ps
   needs: []
   variables:
+    GIT_SUBMODULE_STRATEGY: recursive
+    GIT_SUBMODULE_DEPTH: 1
     MSYSTEM: "MINGW32"
     CHERE_INVOKING: "yes"
     COVERAGE: "1"
@@ -599,6 +601,8 @@ msys2-clang64:
     - win32-ps
   needs: []
   variables:
+    GIT_SUBMODULE_STRATEGY: recursive
+    GIT_SUBMODULE_DEPTH: 1
     MSYSTEM: "CLANG64"
     CHERE_INVOKING: "yes"
     PYTHONUTF8: "1"