Skip to content

Commit dc91c94

Browse files
committed
Ditch haskell setup action
1 parent b7a5c22 commit dc91c94

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,28 @@ jobs:
1616
fail-fast: true
1717
matrix:
1818
os: [ubuntu-22.04, macOS-latest]
19-
ghc: ['9.4', '9.2', '9.0', '8.10', '8.8', '8.6', '8.4', '8.2']
19+
ghc: ['9.6', '9.4', '9.2', '9.0', '8.10', '8.8', '8.6', '8.4', '8.2']
2020
steps:
2121
- uses: actions/checkout@v3
2222
- name: Install prerequisites for GHC 8.2 on ubuntu-22.04
2323
if: runner.os == 'Linux' && matrix.ghc == '8.2'
2424
run: |
2525
sudo apt-get install libncurses5 libtinfo5
26-
- uses: haskell/actions/setup@v2
27-
id: setup-haskell-cabal
28-
with:
29-
ghc-version: ${{ matrix.ghc }}
26+
- name: Setup toolchain
27+
run: |
28+
which ghcup
29+
ghcup install cabal recommended
30+
ghcup install ghc --set ${{ matrix.ghc }}
3031
- uses: actions/cache@v3
3132
name: Cache cabal stuff
3233
with:
3334
path: |
34-
${{ steps.setup-haskell-cabal.outputs.cabal-store }}
35+
~/.cabal/store
3536
dist-newstyle
3637
key: ${{ runner.os }}-${{ matrix.ghc }}
3738
- name: Build
3839
run: |
40+
ghc --version
3941
cabal --version
4042
cabal update
4143
autoreconf --version

0 commit comments

Comments
 (0)