2525  GHC_VERSION : ${{ inputs.ghc }} 
2626  GHC_TARGETS : ${{ inputs.ghc_targets }} 
2727  CABAL_VERSION : ${{ inputs.cabal }} 
28+   BOOTSTRAP_HASKELL_NONINTERACTIVE : 1 
29+   BOOTSTRAP_HASKELL_MINIMAL : 1 
2830  DEBIAN_FRONTEND : noninteractive 
2931  TZ : Asia/Singapore 
3032
@@ -186,6 +188,7 @@ jobs:
186188
187189   build-linux-32bit :
188190    name : Build linux binaries (32bit) 
191+     needs : ["tool-output"] 
189192    runs-on : ubuntu-latest 
190193    strategy :
191194      fail-fast : false 
@@ -204,9 +207,9 @@ jobs:
204207          ref : ${{ matrix.branch }} 
205208
206209      - name : Run build (32 bit linux) 
207-         uses : docker://hasufell/ i386- alpine-haskell :3.21  
210+         uses : docker://i386/ alpine:3.20  
208211        with :
209-           args : sh -c "export PATH=$HOME/.ghcup/bin:$PATH && bash .github/scripts/build.sh" 
212+           args : sh -c "apk update && apk add curl bash git ${{ needs.tool-output.outputs.apk_tools }} &&  export PATH=$HOME/.ghcup/bin:$PATH && curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh && ghcup install cabal ${{ env.CABAL_VERSION }}  && bash .github/scripts/build.sh" 
210213
211214      - if : always() 
212215        name : Upload artifact 
@@ -220,6 +223,7 @@ jobs:
220223
221224   build-arm :
222225    name : Build ARM binary 
226+     needs : ["tool-output"] 
223227    runs-on : ubuntu-22.04-arm 
224228    env :
225229      TARBALL_EXT : tar.xz 
@@ -244,20 +248,20 @@ jobs:
244248          ref : ${{ matrix.branch }} 
245249
246250      - if : matrix.platform.DISTRO == 'Debian' 
247-         uses : docker://hasufell/ arm64v8- debian-haskell :11 
251+         uses : docker://arm64v8/ debian:11 
248252        name : Run build (aarch64 linux) 
249253        with :
250-           args : sh -c "export PATH=$HOME/.ghcup/bin:$PATH && bash .github/scripts/build.sh" 
254+           args : sh -c "apt-get update && apt-get install -y curl bash git ${{ needs.tool-output.outputs.apt_tools }} &&  export PATH=$HOME/.ghcup/bin:$PATH && curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh && ghcup install cabal ${{ env.CABAL_VERSION }}  && bash .github/scripts/build.sh" 
251255        env :
252256          ARTIFACT : ${{ matrix.platform.ARTIFACT }} 
253257          DISTRO : ${{ matrix.platform.DISTRO }} 
254258          ADD_CABAL_ARGS : " " 
255259
256260      - if : matrix.platform.DISTRO == 'Alpine' 
257-         uses : docker://hasufell/ arm64v8- alpine-haskell :3.21  
261+         uses : docker://arm64v8/ alpine:3.20  
258262        name : Run build (aarch64 linux alpine) 
259263        with :
260-           args : sh -c "export PATH=$HOME/.ghcup/bin:$PATH && bash .github/scripts/build.sh" 
264+           args : sh -c "apk update && apk add curl bash git ${{ needs.tool-output.outputs.apk_tools }} &&  export PATH=$HOME/.ghcup/bin:$PATH && curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh && ghcup install cabal ${{ env.CABAL_VERSION }}  && bash .github/scripts/build.sh" 
261265        env :
262266          ARTIFACT : ${{ matrix.platform.ARTIFACT }} 
263267          DISTRO : ${{ matrix.platform.DISTRO }} 
@@ -604,14 +608,14 @@ jobs:
604608#           path: ./out
605609# 
606610#       - name: Run build (32 bit linux)
607- #         uses: docker://hasufell/ i386- alpine-haskell :3.21 
611+ #         uses: docker://i386/ alpine:3.20 
608612#         with:
609- #           args: sh -c "apk update && apk add groff && git config --system --add safe.directory $GITHUB_WORKSPACE && export PATH=$HOME/.ghcup/bin:$PATH && bash .github/scripts/test .sh"
613+ #           args: sh -c "apk update && apk add curl bash git ${{ needs.tool-output.outputs.apk_tools }}  groff && git config --system --add safe.directory $GITHUB_WORKSPACE && export PATH=$HOME/.ghcup/bin:$PATH && curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh && ghcup install cabal ${{ env.CABAL_VERSION }} &&  bash .github/scripts/build .sh"
610614
611615  test-arm :
612616    name : Test ARM binary 
613617    runs-on : ubuntu-22.04-arm 
614-     needs : ["build-arm"] 
618+     needs : ["tool-output", " build-arm"] 
615619    if : ${{ inputs.test }} 
616620    env :
617621      ADD_CABAL_ARGS : " " 
@@ -641,19 +645,19 @@ jobs:
641645          path : ./out 
642646
643647      - if : matrix.platform.DISTRO == 'Debian' 
644-         uses : docker://hasufell/ arm64v8- debian-haskell :11 
648+         uses : docker://arm64v8/ debian:11 
645649        name : Run build (aarch64 linux) 
646650        with :
647-           args : sh -c "git config --system --add safe.directory $GITHUB_WORKSPACE && apt-get update  && apt-get install -y groff-base  && export PATH=$HOME/.ghcup/bin:$PATH  && bash .github/scripts/test.sh" 
651+           args : sh -c "apt-get update && apt-get install -y curl bash  git groff-base ${{ needs.tool-output.outputs.apt_tools }} && git  config --system --add safe.directory $GITHUB_WORKSPACE && export PATH=$HOME/.ghcup/bin:$PATH  && curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh  && ghcup install cabal ${{ env.CABAL_VERSION }}  && bash .github/scripts/test.sh" 
648652        env :
649653          ARTIFACT : ${{ matrix.platform.ARTIFACT }} 
650654          DISTRO : ${{ matrix.platform.DISTRO }} 
651655
652656      - if : matrix.platform.DISTRO == 'Alpine' 
653-         uses : docker://hasufell/ arm64v8- alpine-haskell :3.21  
657+         uses : docker://arm64v8/ alpine:3.20  
654658        name : Run build (aarch64 linux alpine) 
655659        with :
656-           args : sh -c "git config --system --add safe.directory $GITHUB_WORKSPACE && apk update && apk add groff &&  export PATH=$HOME/.ghcup/bin:$PATH && bash .github/scripts/test.sh" 
660+           args : sh -c "apk update && apk add curl bash  git groff ${{ needs.tool-output.outputs.apk_tools }} && git  config --system --add safe.directory $GITHUB_WORKSPACE && export PATH=$HOME/.ghcup/bin:$PATH && curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh && ghcup install cabal ${{ env.CABAL_VERSION }}  && bash .github/scripts/test.sh" 
657661        env :
658662          ARTIFACT : ${{ matrix.platform.ARTIFACT }} 
659663          DISTRO : ${{ matrix.platform.DISTRO }} 
0 commit comments