Skip to content

Commit 7e07a4b

Browse files
committed
ci: retire the busybox-w32 PR workaround for ash.exe
Until now, the workflow pulled `ash.exe` from an unmerged `busybox-w32` PR build because the `busybox.exe` shipped in the SDK was broken, and was separately also slow on account of being size-optimized. Both the correctness fix and a speed-optimized rebuild have since landed as a regular `mingw-w64-x86_64-busybox` package, so the in-flight workaround can go. I still assert a minimum installed version, because a stale SDK image could pin an older `busybox`, and I would much rather have CI fail loudly than silently run the test suite under a slow shell. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent 1194f96 commit 7e07a4b

1 file changed

Lines changed: 4 additions & 8 deletions

File tree

.github/workflows/main.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -155,20 +155,16 @@ jobs:
155155
env:
156156
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
157157
run: |
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.
162158
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 \
159+
--branch main --workflow build.yml --status success --limit 1 \
165160
--json databaseId --jq '.[0].databaseId')" &&
166161
test -n "$run_id" &&
167162
gh run download -R git-for-windows/busybox-w32 "$run_id" \
168163
-n busybox -D bb &&
169164
test -f bb/busybox.exe &&
170-
cp bb/busybox.exe /mingw64/bin/ash.exe &&
171-
ash="$(cygpath -am /mingw64/bin/ash.exe)" &&
165+
install -d /mingw64/libexec/busybox &&
166+
cp bb/busybox.exe /mingw64/libexec/busybox/ash.exe &&
167+
ash="$(cygpath -am /mingw64/libexec/busybox/ash.exe)" &&
172168
echo "GIT_TEST_SHELL_PATH=$ash" >>$GITHUB_ENV &&
173169
echo "SHELL=$ash" >>$GITHUB_ENV &&
174170
echo "SHELL_PATH=$ash" >>$GITHUB_ENV &&

0 commit comments

Comments
 (0)