From 4b47a232ad69011394bcaa40749376f192c6c066 Mon Sep 17 00:00:00 2001
From: Julian Ospald <hasufell@posteo.de>
Date: Sat, 4 Jan 2025 17:56:24 +0800
Subject: [PATCH] Use 'with:' to specify toolchain

---
 .github/workflows/ci.yml | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f44d680..ecfceab 100644
--- 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: |
-- 
GitLab