Merge msys2-3.6.9: fix GCC 16 build error, add libzstd-devel#133
Merged
Conversation
Since gcc 16 this triggers -Werror=unused-but-set-variable= Remove the unused variable.
See 1387ea9 - our binutils now pulls in zstd, and cygwin will only consider linking to it if it is present. Install it so it is found at configure time.
The ping pipeline (git -> bash -> cat | ping) involves multiple process spawns that can take longer than 5 seconds on loaded CI runners. Increase the timeout from the default 5s to 10s. Assisted-by: Opus 4.6 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The SSH clone startup (git -> ssh -> sshd -> powershell -> git upload-pack) involves a deep process chain plus SSH key exchange. On a successful CI run this already took 5.17 seconds against the 5-second timeout, passing only because the regex matched on the last capture iteration. Increase the timeout from 5s to 15s. Assisted-by: Opus 4.6 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
mjcheetham
approved these changes
May 22, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This merges the msys2-3.6.9 branch from the MSYS2 fork, picking up two new patches on top of the existing cygwin-3.6.9 base:
The first patch removes an unused variable in cygcheck that causes a build error with GCC 16 (which now treats
-Wunused-but-set-variableas an error by default).The second patch adds the missing
libzstd-develbuild dependency to the CI workflow, needed because binutils now pulls in zstd and the Cygwin build system only considers linking against it when the development headers are present at configure time.While at it, fix up the UI tests to squash two flakes that hit this here PR, by extending some timeouts.
Closes git-for-windows/git#6252