Skip to content

Commit a9749da

Browse files
committed
Fix macOS CI
1 parent c0f1c2c commit a9749da

File tree

1 file changed

+6
-13
lines changed

1 file changed

+6
-13
lines changed

.github/workflows/test.yaml

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,45 +17,38 @@ jobs:
1717
matrix:
1818
os: [ubuntu-latest]
1919
ghc: ['8.6', '8.8', '8.10', '9.0', '9.2', '9.4', '9.6', '9.8']
20-
cabal: ['3.8.1.0']
2120
include:
2221
- os: macOS-latest
2322
ghc: '9.4'
24-
cabal: '3.10.2.1'
2523
- os: macOS-latest
2624
ghc: '9.6'
27-
cabal: '3.10.2.1'
2825
- os: macOS-latest
2926
ghc: '9.8'
30-
cabal: '3.10.2.1'
3127
- os: windows-latest
3228
ghc: '9.4'
33-
cabal: '3.10.2.1'
3429
- os: windows-latest
3530
ghc: '9.6'
36-
cabal: '3.10.2.1'
3731
- os: windows-latest
3832
ghc: '9.8'
39-
cabal: '3.10.2.1'
4033
steps:
41-
- uses: actions/checkout@v3
34+
- uses: actions/checkout@v4
35+
4236

4337
- name: Install dependencies (Ubuntu)
4438
if: runner.os == 'Linux'
4539
run: |
4640
sudo apt-get -y update
4741
sudo apt-get -y install libtinfo5 libtinfo6 libncurses5 libncurses6
4842
49-
- name: Install ghc/cabal
43+
- if: runner.os != 'Windows'
44+
name: Setup toolchain
5045
run: |
51-
set -eux
52-
ghcup install ghc --set ${{ matrix.ghc }}
53-
ghcup install cabal ${{ matrix.cabal }}
54-
shell: bash
46+
curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 BOOTSTRAP_HASKELL_GHC_VERSION=${{ matrix.ghc }} BOOTSTRAP_HASKELL_ADJUST_BASHRC=yes sh
5547
5648
- name: Build
5749
run: |
5850
set -eux
51+
[ -e ~/.ghcup/env ] && . ~/.ghcup/env
5952
echo ${{ matrix.ghc }}
6053
echo $(ghc --numeric-version)
6154
cabal update

0 commit comments

Comments
 (0)