F

haskell · Dec 26, 2024 · 04f2878 · 04f2878
1 parent 46e9dcf
commit 04f2878
Showing 1 changed file with 6 additions and 21 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -32,11 +32,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - uses: actions/checkout@v4
-      with:
-        repository: andreabedini/haskell-actions
-        path: ghcup
-    - uses: ./ghcup/ghcup
+    - uses: haskell/ghcup-setup@v1
 
     - name: Install dependencies (Ubuntu)
       if: runner.os == 'Linux'
@@ -83,12 +79,7 @@ jobs:
       run: |
         apt-get update -y
         apt-get install -y autoconf build-essential zlib1g-dev libgmp-dev curl libtinfo-dev git
-    - uses: actions/checkout@v1
-      with:
-        repository: andreabedini/haskell-actions
-        ref: 'main'
-        path: ghcup
-    - uses: ./../ghcup/ghcup
+    - uses: haskell/ghcup-setup@v1
     - uses: actions/checkout@v1
     - name: Test
       run: |
@@ -146,11 +137,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - uses: actions/checkout@v4
-        with:
-          repository: andreabedini/haskell-actions
-          path: ghcup
-      - uses: ./ghcup/ghcup
+      - uses: haskell/ghcup-setup@v1
 
       - name: Run build
         run: |
@@ -184,16 +171,14 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - uses: actions/checkout@v4
-        with:
-          repository: andreabedini/haskell-actions
-          path: ghcup
-      - uses: ./ghcup/ghcup
+      - uses: haskell/ghcup-setup@v1
 
       - name: Run build
         run: |
           sudo 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
           ghcup install ghc --set ${{ matrix.ghc }}
+          ghcup install cabal --set recommended
+          cabal update
           cabal test
           cabal bench