diff options
| author | Philip Withnall <philip@tecnocode.co.uk> | 2024-09-29 12:56:15 +0000 |
|---|---|---|
| committer | Philip Withnall <philip@tecnocode.co.uk> | 2024-09-29 12:56:15 +0000 |
| commit | c96cd22cf9cd225b8f1ea03e99b49a149869a177 (patch) | |
| tree | df7717d44e5b290897a4f30191342cc26ece0d0c | |
| parent | 034d528348aa224c204dd4964dfdcfa8bfd86070 (diff) | |
| parent | fe8e4eb6dbc96c185b8abbda675bcd8e87ae5070 (diff) | |
Merge branch '3042-msys2-still-intermittent' into 'main'
Revert "CI: Mark msys2-mingw32 as allowing failures"
Closes #3042
See merge request GNOME/glib!4190
| -rw-r--r-- | .gitlab-ci.yml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 95342c493..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,8 +529,10 @@ 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: - allow_failure: true extends: .only-default-and-merges stage: build tags: |