Patch pacman and libgpgme for testing #17
Merged
Conversation
This file contains 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
dennisameling
changed the title
|
Let's see if this works. If it does, I'll kick off a bunch of other pipelines to ensure the workaround is robust. |
|
Whoops, what happened there @dennisameling? |
|
Did some testing to verify everything works as expected 😉 just posted my test results here. |
In my local testing, I didn't run into hangs anymore when pacman runs in debug mode. Maybe because it just outputs so many lines? Let's try if it works in CI as well Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
dscho
force-pushed
the
patched-pacman-gpgme
branch
6 times, most recently
from
3bf8af5
to
767dbdf
Compare
…ARM64 This downloads the PR build artifact of msys2/MSYS2-packages#4583 and installs it in `git-sdk-arm64`. The idea is that the subsequent `sync` job runs as well as the subsequent `build-and-deploy` runs in `git-for-windows-automation` won't hang but instead succeed. Signed-off-by: Dennis Ameling <dennis@dennisameling.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho
force-pushed
the
patched-pacman-gpgme
branch
from
60cb253
to
e6db89d
Compare
added 2 commits
May 22, 2024 21:50
It has been overridden with a version that does not deadlock on Windows/ARM64
curl (8.7.1-1 -> 8.8.0-1) git (2.44.0-1 -> 2.45.1-1) glib2 (2.78.4-1 -> 2.78.6-1) libcurl (8.7.1-1 -> 8.8.0-1) libnghttp2 (1.61.0-1 -> 1.62.0-1) libsasl (2.1.28-4 -> 2.1.28-5) libxml2 (2.12.6-1 -> 2.12.7-1) mingw-w64-clang-aarch64 (7zip-23.01-1 -> 7zip-24.05-1) mingw-w64-clang-aarch64-crt-git (11.0.0.r731.g8fdf7c9b5-1 -> 11.0.0.r750.g05598db99-1) mingw-w64-clang-aarch64-headers-git (11.0.0.r731.g8fdf7c9b5-1 -> 11.0.0.r750.g05598db99-1) mingw-w64-clang-aarch64-libc++ (18.1.4-1 -> 18.1.5-1) mingw-w64-clang-aarch64-libmangle-git (11.0.0.r731.g8fdf7c9b5-1 -> 11.0.0.r750.g05598db99-1) mingw-w64-clang-aarch64-libunwind (18.1.4-1 -> 18.1.5-1) mingw-w64-clang-aarch64-libwinpthread-git (11.0.0.r731.g8fdf7c9b5-1 -> 11.0.0.r750.g05598db99-1) mingw-w64-clang-aarch64-libxml2 (2.12.6-1 -> 2.12.7-1) mingw-w64-clang-aarch64-libzip (1.10.1-1 -> 1.10.1-2) mingw-w64-clang-aarch64-lldb (18.1.4-1 -> 18.1.5-1) mingw-w64-clang-aarch64-llvm-openmp (18.1.4-1 -> 18.1.5-1) mingw-w64-clang-aarch64-polly (18.1.4-1 -> 18.1.5-1) mingw-w64-clang-aarch64-tools-git (11.0.0.r731.g8fdf7c9b5-1 -> 11.0.0.r750.g05598db99-1) mingw-w64-clang-aarch64-winpthreads-git (11.0.0.r731.g8fdf7c9b5-1 -> 11.0.0.r750.g05598db99-1) mingw-w64-clang-aarch64-winstorecompat-git (11.0.0.r731.g8fdf7c9b5-1 -> 11.0.0.r750.g05598db99-1) msys2-w32api-headers (11.0.1.r0.gc3e587c06-3 -> 11.0.1.r750.g05598db99-1) msys2-w32api-runtime (11.0.1.r0.gc3e587c06-2 -> 11.0.1.r750.g05598db99-1) nano (7.2-1 -> 8.0-1) pacman-contrib (1.10.5-1 -> 1.10.6-1) pacman-mirrors (20240210-1 -> 20240504-1) tig (2.5.9-1 -> 2.5.10-1) vim (9.1.0264-1 -> 9.1.0380-1) Signed-off-by: Git for Windows Build Agent <ci@git-for-windows.build>
Now that we have that patched version, we do not need to update _again_. This reverts commit e6db89d (Update pacman to a patched version that does not deadlock on Windows/ARM64, 2024-05-06). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
|
@dennisameling it worked! https://github.com/git-for-windows/git-for-windows-automation/actions/runs/9191434608 built cURL v8.8.0 without the need to RDP into the runner and play process-stopping games. |
This was referenced May 23, 2024
dennisameling
added a commit
that referenced
this pull request
Sep 14, 2024
…to the repo In #cbb359e4e48c185295e6867789ec0807df694b16, I accidentally checked in the .tar.zst files used for installing the latest pacman version. Let's remove those. Ref: #17
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.
In msys2/MSYS2-packages#4583, we propose a way forward for MSYS2 to work around the Windows/ARM64 hangs. This PR has not been merged yet, so let's update
git-sdk-arm64ahead of time (and for the time being preventpacmanfrom being updated to avoid regressing on those deadlocks).