Skip to content

Commit 2bffdb8

Browse files
committed
fixup! ci: also run the Windows test suite with BusyBox' ash
1 parent acd8bcf commit 2bffdb8

1 file changed

Lines changed: 15 additions & 2 deletions

File tree

.github/workflows/main.yml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,22 @@ jobs:
152152
- name: download BusyBox' ash.exe and use it as the POSIX shell
153153
if: matrix.use-busybox == true
154154
shell: bash
155+
env:
156+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
155157
run: |
156-
curl -fLo /mingw64/bin/ash.exe \
157-
https://github.com/git-for-windows/git-sdk-64/raw/c7bf8b60df36106efa91fc0f68034bcef4896bfb/mingw64/libexec/busybox/ash.exe &&
158+
# TEMPORARY: pull the freshly-built, heap-corruption-fixed ash.exe
159+
# straight from the busybox-w32 PR build (git-for-windows/busybox-w32#15)
160+
# instead of the stale copy shipped in git-sdk-64. Once that fix is
161+
# released into the SDK this step reverts to the pinned download.
162+
run_id="$(gh run list -R git-for-windows/busybox-w32 \
163+
--branch fix-quote-arg-msys2-heap-corruption \
164+
--workflow build.yml --status success --limit 1 \
165+
--json databaseId --jq '.[0].databaseId')" &&
166+
test -n "$run_id" &&
167+
gh run download -R git-for-windows/busybox-w32 "$run_id" \
168+
-n busybox -D bb &&
169+
test -f bb/busybox.exe &&
170+
cp bb/busybox.exe /mingw64/bin/ash.exe &&
158171
ash="$(cygpath -am /mingw64/bin/ash.exe)" &&
159172
echo "GIT_TEST_SHELL_PATH=$ash" >>$GITHUB_ENV &&
160173
echo "SHELL=$ash" >>$GITHUB_ENV &&

0 commit comments

Comments
 (0)