Fix update-via-pacman.ps1 and downgrade MSYS2 runtime to v3.5.4 #29
Conversation
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
The post-install script of `git-extra` (which we source manually) assumes that the native `git.exe` is in the `PATH`. Let's make it so. Signed-off-by: Johannes Schindelin <[email protected]>
The post-install script is supposed to be run in the root directory of the SDK. Let's do that, then. Signed-off-by: Johannes Schindelin <[email protected]>
The current version, v3.5.5, suffers from many a problem, two having seen fixes (a mis-handling of __SIGFLUSHFAST, the other a mis-handling of the X_OK flag when running as administrator) and at least one more that causes inexplicable hangs in Git's test suite. It is too late in the Git for Windows v2.48.0 cycle to investigate these problems thoroughly and flesh out fixes, therefore the only remaining option is to downgrade to the last known-okay MSYS2 runtime. Signed-off-by: Johannes Schindelin <[email protected]>
It has been overridden with a version that does not hang Git's test suite
This reverts commit f3b7ce3 because its job has been done and its services are no longer needed. Signed-off-by: Johannes Schindelin <[email protected]>
dscho
commented
Jan 2, 2025
| rm ${{ steps.download.outputs.result }} *.pkg.tar.xz.sig && | ||
| git add -A && | ||
| git commit -m 'Downgrade MSYS2 runtime to a non-hanging version' && | ||
| sed -i 's/^#\? *\(IgnorePkg *=\).*/\1 msys2-runtime/' etc/pacman.conf && |
There was a problem hiding this comment.
As I have figured out in #28, this is incorrect, but it is "a happy little mistake" as the consequence was a bug fix... 😃
Suggested change
| sed -i 's/^#\? *\(IgnorePkg *=\).*/\1 msys2-runtime/' etc/pacman.conf && | |
| - sed -i 's/^#\? *\(IgnorePkg *=\).*/\1 msys2-runtime/' etc/pacman.conf && | |
| + sed -i 's/^\(# *\(IgnorePkg *=\).*\| *\(IgnorePkg =.*\)\)/\2\3 msys2-runtime/' etc/pacman.conf && |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 corresponds to git-for-windows#88 and git-for-windows#89