Merge branch 'ci-macos'

haskell · May 1, 2024 · d2b5ed2 · d2b5ed2
2 parents c0f1c2c + a9749da
commit d2b5ed2
Showing 1 changed file with 6 additions and 13 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -17,45 +17,38 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         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-latest
             ghc: '9.4'
-            cabal: '3.10.2.1'
           - os: macOS-latest
             ghc: '9.6'
-            cabal: '3.10.2.1'
           - os: macOS-latest
             ghc: '9.8'
-            cabal: '3.10.2.1'
           - os: windows-latest
             ghc: '9.4'
-            cabal: '3.10.2.1'
           - os: windows-latest
             ghc: '9.6'
-            cabal: '3.10.2.1'
           - os: windows-latest
             ghc: '9.8'
-            cabal: '3.10.2.1'
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
+
 
     - name: Install dependencies (Ubuntu)
       if: runner.os == 'Linux'
       run: |
         sudo apt-get -y update
         sudo apt-get -y install libtinfo5 libtinfo6 libncurses5 libncurses6
 
-    - name: Install ghc/cabal
+    - if: runner.os != 'Windows'
+      name: Setup toolchain
       run: |
-        set -eux
-        ghcup install ghc --set ${{ matrix.ghc }}
-        ghcup install cabal ${{ matrix.cabal }}
-      shell: bash
+        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
 
     - name: Build
       run: |
         set -eux
+        [ -e ~/.ghcup/env ] && . ~/.ghcup/env
         echo ${{ matrix.ghc }}
         echo $(ghc --numeric-version)
         cabal update