Merge branch 'ghcup-setup'

Author: hasufell

.github/workflows/test.yaml

@@ -17,10 +17,10 @@ jobs:
         ghc: ['8.6', '8.8', '8.10', '9.0', '9.2', '9.4', '9.6', '9.8']
         cabal: ['3.8.1.0']
         include:
-          - os: macOS-12
+          - os: macOS-13
             ghc: '9.4'
             cabal: '3.8.1.0'
-          - os: macOS-12
+          - os: macOS-13
             ghc: '9.6'
             cabal: '3.8.1.0'
           - os: windows-latest
@@ -36,13 +36,16 @@ jobs:
       if: runner.os == 'Linux'
       run: |
         sudo apt-get -y update
-        sudo apt-get -y install libtinfo5 libtinfo6 libncurses5 libncurses6
+        sudo apt-get -y install libtinfo6 libncurses6
+
+    - name: Install GHCup
+      uses: haskell/ghcup-setup@v1
 
     - name: Install ghc/cabal
       run: |
         set -eux
         ghcup install ghc --set ${{ matrix.ghc }}
-        ghcup install cabal ${{ matrix.cabal }}
+        ghcup install cabal --set ${{ matrix.cabal }}
       shell: bash
 
     - name: Build
@@ -59,21 +62,14 @@ jobs:
 
   i386:
     runs-on: ubuntu-latest
-    container:
-      image: i386/ubuntu:bionic
     steps:
-    - name: Install
-      run: |
-        apt-get update -y
-        apt-get install -y autoconf build-essential zlib1g-dev libgmp-dev curl libncurses5 libtinfo5 libncurses5-dev libtinfo-dev
-        curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 sh
-    - uses: actions/checkout@v1
-    - name: Test
-      run: |
-        . ~/.ghcup/env
-        cabal update
-        cabal test
-        cabal bench
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Run build (32 bit linux)
+        uses: docker://hasufell/i386-alpine-haskell:3.12
+        with:
+          args: sh -c "cabal update && cabal test && cabal bench"
 
   # We use github.com/haskell self-hosted runners for ARM testing.
   # If they become unavailable in future, put ['armv7', 'aarch64']
@@ -123,6 +119,9 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: Install GHCup
+        uses: haskell/ghcup-setup@v1
+
       - name: Run build
         run: |
           bash .github/scripts/brew.sh git coreutils llvm@13 autoconf automake
@@ -132,8 +131,7 @@ jobs:
           export LD=ld
           export AR="$HOME/.brew/opt/llvm@13/bin/llvm-ar"
           export RANLIB="$HOME/.brew/opt/llvm@13/bin/llvm-ranlib"
-          . .github/scripts/env.sh
-          curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 BOOTSTRAP_HASKELL_GHC_VERSION=${{ matrix.ghc }} BOOTSTRAP_HASKELL_ADJUST_BASHRC=yes sh
+          cabal update
           cabal test
           cabal bench
         env:
@@ -153,11 +151,16 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: Install prerequisites
+        run: |
+          sudo pkg install -y curl gcc gmp gmake ncurses perl5 libffi libiconv git bash misc/compat10x misc/compat11x misc/compat12x gmake autoconf
+
+      - name: Install GHCup
+        uses: haskell/ghcup-setup@v1
+
       - name: Run build
         run: |
-          pkg install -y curl gcc gmp gmake ncurses perl5 libffi libiconv git bash misc/compat10x misc/compat11x misc/compat12x gmake llvm14
-          . .github/scripts/env.sh
-          curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 BOOTSTRAP_HASKELL_GHC_VERSION=${{ matrix.ghc }} BOOTSTRAP_HASKELL_ADJUST_BASHRC=yes sh
+          cabal update
           cabal test
           cabal bench
 
@@ -174,7 +177,7 @@ jobs:
         arch: ['s390x', 'ppc64le']
     steps:
     - uses: actions/checkout@v4
-    - uses: uraimo/run-on-arch-action@v2.7.2
+    - uses: uraimo/run-on-arch-action@v2.8.1
       timeout-minutes: 60
       with:
         arch: ${{ matrix.arch }}