Use 'with:' to specify toolchain

haskell · Jan 4, 2025 · ad18053 · ad18053
1 parent 81ebaf9
commit ad18053
Showing 1 changed file with 12 additions and 20 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,11 +31,9 @@ jobs:
 
     - name: Install GHCup
       uses: haskell/ghcup-setup@v1
-
-    - name: Setup toolchain
-      run: |
-        ghcup install ghc --set ${{ matrix.ghc }}
-        ghcup install cabal --set latest
+      with:
+        ghc: ${{ matrix.ghc }}
+        cabal: latest
 
     - if: runner.os == 'macOS'
       name: Install system deps via brew
@@ -75,11 +73,9 @@ jobs:
 
     - name: Install GHCup
       uses: haskell/ghcup-setup@v1
-
-    - name: Setup toolchain
-      run: |
-        ghcup install ghc --set latest
-        ghcup install cabal --set latest
+      with:
+        ghc: latest
+        cabal: latest
 
     - uses: actions/checkout@v4
 
@@ -102,11 +98,9 @@ jobs:
 
     - name: Install GHCup
       uses: haskell/ghcup-setup@v1
-
-    - name: Setup toolchain
-      run: |
-        ghcup install ghc --set latest
-        ghcup install cabal --set latest
+      with:
+        ghc: latest
+        cabal: latest
 
     - uses: actions/checkout@v4
     - name: Test
@@ -176,11 +170,9 @@ jobs:
 
       - name: Install GHCup
         uses: haskell/ghcup-setup@v1
-
-      - name: Setup toolchain
-        run: |
-          ghcup install ghc --set ${{ matrix.ghc }}
-          ghcup install cabal --set latest
+        with:
+          ghc: ${{ matrix.ghc }}
+          cabal: latest
 
       - name: Run build
         run: |