From 53f20d79b81a9e609cfd9f1734033d287700bb26 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Wed, 14 Aug 2024 12:29:36 +0100 Subject: [PATCH 1/2] Revert "CI: Mark msys2-mingw32 as allowing failures" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 16819a40245a7d844382cab55ee4725f33718bab. The failure this was added for is intermittent and has been going on a long time; it’s not a new failure caused by msys2 dependency/packaging changes, so the policy in .gitlab-ci.yml doesn’t apply. It would be great if someone fixed #3042, but un-gating GLib from msys2 testing is not the right tradeoff for it. See: #3042 --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 95342c493..9f53706e1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -529,7 +529,6 @@ cross-mingw64: # 4. Rebase any pending broken MRs on top of the commit which makes the CI job # non-fatal, so that development on `main` is unblocked. msys2-mingw32: - allow_failure: true extends: .only-default-and-merges stage: build tags: From fe8e4eb6dbc96c185b8abbda675bcd8e87ae5070 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Wed, 14 Aug 2024 12:32:54 +0100 Subject: [PATCH 2/2] ci: Clarify msys2 allow-failure policy See the previous commit and discussion on #3420. Signed-off-by: Philip Withnall --- .gitlab-ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9f53706e1..09807e495 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -516,7 +516,8 @@ cross-mingw64: # A note about msys2: it’s a rolling release distribution, running Windows under # Docker isn’t really supported, and the win32-ps CI runner is shared. All that # adds up to mean that we have to run CI against the latest msys2 packages, and -# that this occasionally causes build failures in GLib due to changes in msys2. +# that this occasionally causes deterministic build failures in GLib due to +# changes in msys2. # In order to avoid that pre-empting other GLib development, the policy in such # cases is to: # 1. Immediately and without hesitation make the msys2-* CI jobs non-fatal @@ -528,6 +529,9 @@ cross-mingw64: # are notified and can work on it. # 4. Rebase any pending broken MRs on top of the commit which makes the CI job # non-fatal, so that development on `main` is unblocked. +# +# This policy doesn’t apply to intermittent flaky test failures, only to +# consistent build failures caused by changed dependencies or build environment. msys2-mingw32: extends: .only-default-and-merges stage: build