luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 07:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3042-msys2-still-intermittent' into 'main'

Browse Source 
Revert "CI: Mark msys2-mingw32 as allowing failures"

Closes #3042

See merge request GNOME/glib!4190
This commit is contained in:
Philip Withnall 2024-09-29 12:56:15 +00:00
commit c96cd22cf9
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitlab-ci.yml
View File

@ -516,7 +516,8 @@ cross-mingw64:
# A note about msys2: it’s a rolling release distribution, running Windows under # 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 # 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 # 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 # In order to avoid that pre-empting other GLib development, the policy in such
# cases is to: # cases is to:
# 1. Immediately and without hesitation make the msys2-* CI jobs non-fatal # 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. # are notified and can work on it.
# 4. Rebase any pending broken MRs on top of the commit which makes the CI job # 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. # 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: msys2-mingw32:
allow_failure: true
extends: .only-default-and-merges extends: .only-default-and-merges
stage: build stage: build
tags: tags: