Skip to content

Commit

Permalink
DEBUG: verify that the newly-patched MSYS2 runtime works around the W…
Browse files Browse the repository at this point in the history
…indows/ARM64 deadlocks

I updated git-for-windows/msys2-runtime#73 to
build the newest iteration of the dead-lock workaround, which worked
100% in my tests.

Let's verify that it works around the issues in `update-via-pacman.ps1`,
too.

Signed-off-by: Johannes Schindelin <[email protected]>
  • Loading branch information
dscho committed Nov 13, 2024
1 parent 87ec58c commit 676129d
Showing 1 changed file with 48 additions and 7 deletions.
55 changes: 48 additions & 7 deletions .github/workflows/sync.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
name: sync

on:
schedule:
- cron: "57 2 * * *"
workflow_dispatch:
inputs:
debug_with_ssh_key:
description: 'Public SSH key to use to debug failures'
required: false
push:

env:
GIT_CONFIG_PARAMETERS: "'user.name=Git for Windows Build Agent' '[email protected]' 'windows.sdk64.path=${{ github.workspace }}' 'windows.sdk32.path=' 'http.sslbackend=schannel' 'core.autocrlf=false' 'checkout.workers=16'"
Expand All @@ -25,10 +19,57 @@ jobs:
with:
persist-credentials: true
token: ${{ secrets.PUSH_TOKEN }}
- name: download patched MSYS2 runtime
id: download
shell: bash
env:
GH_TOKEN: ${{ github.token }}
run: |
# Only do this if `pacman` is prevented from being upgraded
grep '^ *IgnorePkg *= *pacman' etc/pacman.conf || exit 0
cat >/dev/null <<\EOF
sha="$(gh api repos/git-for-windows/msys2-runtime/pulls/73 \
--jq '.head.sha')" &&
check_run_url="$(gh api repos/git-for-windows/msys2-runtime/commits/$sha/check-runs \
--jq '.check_runs[] | select(.name=="build") | .url')" &&
workflow_job_url="$(gh api "${check_run_url#https://api.github.com/}" --jq '.details_url')" &&
workflow_run_url="${workflow_job_url%/job/*}" &&
artifacts_url="$(gh api "repos/${workflow_run_url#https://github.com/}" --jq '.artifacts_url')" &&
zip_url="$(gh api "${artifacts_url#https://api.github.com/}" --jq '.artifacts[].archive_download_url')"
EOF
zip_url=https://api.github.com/repos/git-for-windows/msys2-runtime/actions/artifacts/2178808019/zip &&
curl -H "Authorization: token ${{secrets.GITHUB_TOKEN}}" -#sLo /tmp/install.zip "$zip_url" &&
echo "result=$(cygpath -aw /tmp/install.zip)" >>$GITHUB_OUTPUT
- name: unzip MSYS2 runtime
if: steps.download.outputs.result != ''
shell: pwsh
run: "C:\\Windows\\system32\\tar -xf ${{ steps.download.outputs.result }}"
- name: use git-sdk-arm64's Bash and Git for Windows' git.exe
run: "usr\\bin\\bash.exe -lc 'cygpath -aw /usr/bin >>$GITHUB_PATH && cygpath -aw /c/Program\\ Files/Git/cmd/ >>$GITHUB_PATH'"
- name: commit MSYS2 runtime
shell: bash
run: |
set -x
# Give the `/etc/profile.d/` scripts a chance to set things up
bash -lc 'uname -a' &&
git add -A &&
git commit -m 'Install patches MSYS2 runtime' &&
sed -i 's/^IgnorePkg *=.*/# &/' etc/pacman.conf &&
git commit -m 'Allow `pacman` to be upgraded again' \
-m 'It had been overridden with a version that does not deadlock on Windows/ARM64, but now an MSYS2 runtime has been installed that prevents that deadlock in a much better way' \
etc/pacman.conf &&
git push origin HEAD
- name: Update all Pacman packages
shell: pwsh
run: |
& .\update-via-pacman.ps1
- name: Update all Pacman packages again, for good measure
shell: pwsh
run: |
& .\update-via-pacman.ps1
- name: use git-sdk-arm64's Bash and Git for Windows' git.exe
run: "usr\\bin\\bash.exe -lc 'cygpath -aw /usr/bin >>$GITHUB_PATH && cygpath -aw /c/Program\ Files/Git/cmd/ >>$GITHUB_PATH'"
- name: deal with large DLL files
Expand Down

0 comments on commit 676129d

Please sign in to comment.