Merge pull request #9485 from haskell/mergify/bp/3.10/pr-9463

Migrate to haskell-actions/setup (backport #9463)
haskell · Dec 16, 2023 · 7553f8a · 7553f8a
2 parents ebf64c5 + 61d3c18
commit 7553f8a
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -67,7 +67,7 @@ jobs:
             sudo chown -R $USER /usr/local/.ghcup
             sudo chmod -R 777 /usr/local/.ghcup
           fi
-      - uses: haskell/actions/setup@v2
+      - uses: haskell-actions/setup@v2
         id: setup-haskell
         with:
           ghc-version: ${{ matrix.ghc }}
@@ -356,11 +356,12 @@ jobs:
           apt-get update
           apt-get install -y ghc-${{ matrix.extra-ghc }}-dyn
 
-      - uses: haskell/actions/setup@v2
+      - uses: haskell-actions/setup@v2
         id: setup-haskell
         with:
           ghc-version: ${{ matrix.ghc }}
-          cabal-version: '3.10.1.0'
+          # Make sure this bindist works in this old environment
+          cabal-version: 3.10.1.0
 
       # As we are reusing the cached build dir from the previous step
       # the generated artifacts are available here,
@@ -415,7 +416,7 @@ jobs:
             sudo chown -R $USER /usr/local/.ghcup
             sudo chmod -R 777 /usr/local/.ghcup
           fi
-      - uses: haskell/actions/setup@v2
+      - uses: haskell-actions/setup@v2
         id: setup-haskell
         with:
           ghc-version: ${{ matrix.ghc }}