Skip to content

Commit 2ee3eee

Browse files
committed
fixup! Disentangle stage1 and stage2
1 parent f34cee4 commit 2ee3eee

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

.github/workflows/reusable-release.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -588,8 +588,9 @@ jobs:
588588

589589
rm -rf .git
590590
(
591+
shopt -s globstar
591592
cd _build/bindist
592-
for file in tests*.tar.gz stage2/ghc*.tar.gz stage3/ghc*.tar.gz ; do tar xzf "$file"; done
593+
for file in **/*.tar.gz ; do tar xzf "$file"; done
593594
)
594595
PATH=$(pwd)/_build/bindist/bin:$PATH ${{ env.MAKE }} -C _build/bindist/testsuite
595596
env:
@@ -628,13 +629,13 @@ jobs:
628629
uses: docker://arm64v8/debian:11
629630
name: Run build (aarch64 linux)
630631
with:
631-
args: sh -c "apt-get update && apt-get install -y curl bash git ${{ needs.tool-output.outputs.apt_tools_test }} && git config --system --add safe.directory $GITHUB_WORKSPACE && rm -rf .git && cd _build/bindist && for file in tests*.tar.gz stage2/ghc*.tar.gz stage3/ghc*.tar.gz; do tar xzf $file; done && cd testsuite && PATH=$GITHUB_WORKSPACE/_build/bindist/bin/:$PATH make"
632+
args: sh -c "apt-get update && apt-get install -y curl bash git ${{ needs.tool-output.outputs.apt_tools_test }} && git config --system --add safe.directory $GITHUB_WORKSPACE && rm -rf .git && cd _build/bindist && for file in tests*.tar.gz stage2/ghc*.tar.gz ; do tar xzf $file; done && cd testsuite && PATH=$GITHUB_WORKSPACE/_build/bindist/bin/:$PATH make"
632633

633634
- if: matrix.platform.ARTIFACT == 'aarch64-linux-unknown'
634635
uses: docker://arm64v8/alpine:3.20
635636
name: Run build (aarch64 linux alpine)
636637
with:
637-
args: sh -c "apk update && apk add curl bash git ${{ needs.tool-output.outputs.apk_tools_test }} && git config --system --add safe.directory $GITHUB_WORKSPACE && rm -rf .git && cd _build/bindist && for file in tests*.tar.gz stage2/ghc*.tar.gz stage3/ghc*.tar.gz; do tar xzf $file; done && cd testsuite && PATH=$GITHUB_WORKSPACE/_build/bindist/bin/:$PATH make"
638+
args: sh -c "apk update && apk add curl bash git ${{ needs.tool-output.outputs.apk_tools_test }} && git config --system --add safe.directory $GITHUB_WORKSPACE && rm -rf .git && cd _build/bindist && for file in tests*.tar.gz stage2/ghc*.tar.gz ; do tar xzf $file; done && cd testsuite && PATH=$GITHUB_WORKSPACE/_build/bindist/bin/:$PATH make"
638639

639640
test-mac-x86_64:
640641
name: Test binary (Mac x86_64)

0 commit comments

Comments
 (0)