Skip to content

Commit

Permalink
Migrate to haskell-actions/setup
Browse files Browse the repository at this point in the history
As of 2023-09-09, haskell/action/setup is no longer maintained.

The comment

  # latest is mandatory for cabal-testsuite, see #8133

is removed; as the validate job was already fixing a version of cabal-install.

(cherry picked from commit 8e09697)

# Conflicts:
#	.github/workflows/validate.yml
  • Loading branch information
andreabedini authored and mergify[bot] committed Nov 29, 2023
1 parent 5d97fcf commit 39b30d8
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ jobs:

- uses: actions/checkout@v3

<<<<<<< HEAD
# See https://github.com/haskell/cabal/pull/8739
- name: Sudo chmod to permit ghcup to update its cache
run: |
Expand All @@ -68,6 +69,9 @@ jobs:
sudo chmod -R 777 /usr/local/.ghcup
fi
- uses: haskell/actions/setup@v2
=======
- uses: haskell-actions/setup@v2
>>>>>>> 8e0969708 (Migrate to haskell-actions/setup)
id: setup-haskell
with:
ghc-version: ${{ matrix.ghc }}
Expand Down Expand Up @@ -356,11 +360,16 @@ 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 }}
<<<<<<< HEAD
cabal-version: '3.10.1.0'
=======
# Make sure this bindist works in this old environment
cabal-version: 3.10.1.0
>>>>>>> 8e0969708 (Migrate to haskell-actions/setup)

# As we are reusing the cached build dir from the previous step
# the generated artifacts are available here,
Expand Down Expand Up @@ -415,7 +424,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 }}
Expand Down

0 comments on commit 39b30d8

Please sign in to comment.