Skip to content

Commit a6e3038

Browse files
committed
CI: Fix artifacts
1 parent e97506d commit a6e3038

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

.github/workflows/reusable-release.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,9 @@ jobs:
153153
mv cabal.tar.gz cabal-$(bin/cabal --numeric-version)-${ARTIFACT}.tar.gz
154154
if [ -e "haskell-toolchain.tar.gz" ] ; then
155155
mv haskell-toolchain.tar.gz haskell-toolchain-${ARTIFACT}.tar.gz
156+
mv ghc-javascript-unknown-ghcjs.tar.gz ghc-javascript-unknown-ghcjs-$(bin/ghc --numeric-version)-${ARTIFACT}.tar.gz
156157
fi
158+
mv tests.tar.gz tests-${ARTIFACT}.tar.gz
157159
env:
158160
ARTIFACT: ${{ matrix.platform.ARTIFACT }}
159161

@@ -195,13 +197,13 @@ jobs:
195197
uses: docker://arm64v8/debian:11
196198
name: Run build (aarch64 linux)
197199
with:
198-
args: sh -c "apt-get update && apt-get install -y curl bash git ${{ needs.tool-output.outputs.apt_tools_build }} && export PATH=$HOME/.ghcup/bin:$PATH && curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh && make CABAL=$PWD/_build/stage0/bin/cabal _build/bindist/ghc.tar.gz _build/bindist/cabal.tar.gz _build/bindist/tests.tar.gz"
200+
args: sh -c "apt-get update && apt-get install -y curl bash git ${{ needs.tool-output.outputs.apt_tools_build }} && export PATH=$HOME/.ghcup/bin:$PATH && curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh && make CABAL=$PWD/_build/stage0/bin/cabal _build/bindist/ghc.tar.gz _build/bindist/cabal.tar.gz _build/bindist/tests.tar.gz && cd _build/bindist && mv ghc.tar.gz ghc-$(bin/ghc --numeric-version)-${{ matrix.platform.ARTIFACT }}.tar.gz && mv cabal.tar.gz cabal-$(bin/cabal --numeric-version)-${{ matrix.platform.ARTIFACT }} && mv tests.tar.gz tests-${{ matrix.platform.ARTIFACT }}"
199201

200202
- if: matrix.platform.ARTIFACT == 'aarch64-linux-unknown'
201203
uses: docker://arm64v8/alpine:3.20
202204
name: Run build (aarch64 linux alpine)
203205
with:
204-
args: sh -c "apk update && apk add curl bash git ${{ needs.tool-output.outputs.apk_tools_build }} && export PATH=$HOME/.ghcup/bin:$PATH && curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh && make CABAL=$PWD/_build/stage0/bin/cabal _build/bindist/ghc.tar.gz _build/bindist/cabal.tar.gz _build/bindist/tests.tar.gz"
206+
args: sh -c "apk update && apk add curl bash git ${{ needs.tool-output.outputs.apk_tools_build }} && export PATH=$HOME/.ghcup/bin:$PATH && curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh && make CABAL=$PWD/_build/stage0/bin/cabal _build/bindist/ghc.tar.gz _build/bindist/cabal.tar.gz _build/bindist/tests.tar.gz && cd _build/bindist && mv ghc.tar.gz ghc-$(bin/ghc --numeric-version)-${{ matrix.platform.ARTIFACT }}.tar.gz && mv cabal.tar.gz cabal-$(bin/cabal --numeric-version)-${{ matrix.platform.ARTIFACT }} && mv tests.tar.gz tests-${{ matrix.platform.ARTIFACT }}"
205207

206208
- if: always()
207209
name: Upload artifact
@@ -383,6 +385,8 @@ jobs:
383385
mv ghc.tar.gz ghc-$(bin/ghc --numeric-version)-${{ env.ARTIFACT }}.tar.gz
384386
mv cabal.tar.gz cabal-$(bin/cabal --numeric-version)-${{ env.ARTIFACT }}.tar.gz
385387
mv haskell-toolchain.tar.gz haskell-toolchain-${{ env.ARTIFACT }}.tar.gz
388+
mv ghc-javascript-unknown-ghcjs.tar.gz ghc-javascript-unknown-ghcjs-$(bin/ghc --numeric-version)-${{ env.ARTIFACT }}.tar.gz
389+
mv tests.tar.gz tests-${{ env.ARTIFACT }}.tar.gz
386390
env:
387391
EXTRA_LIB_DIRS: /usr/local/lib
388392
EXTRA_INCLUDE_DIRS: /usr/local/include

0 commit comments

Comments
 (0)