Skip to content

Commit ecd3da9

Browse files
committed
Merge branch 'ghcup-action'
2 parents 65b0f8f + 742ab2b commit ecd3da9

File tree

1 file changed

+16
-6
lines changed

1 file changed

+16
-6
lines changed

.github/workflows/test.yaml

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
ghc: ['8.6', '8.8', '8.10', '9.0', '9.2', '9.4', '9.6', '9.8']
1818
cabal: ['3.8.1.0']
1919
include:
20-
- os: macos-12
20+
- os: macos-13
2121
ghc: '9.4'
2222
cabal: '3.8.1.0'
23-
- os: macos-12
23+
- os: macos-13
2424
ghc: '9.6'
2525
cabal: '3.8.1.0'
2626
- os: windows-latest
@@ -32,11 +32,13 @@ jobs:
3232
steps:
3333
- uses: actions/checkout@v3
3434

35+
- uses: haskell/ghcup-setup@v1
36+
3537
- name: Install dependencies (Ubuntu)
3638
if: runner.os == 'Linux'
3739
run: |
3840
sudo apt-get -y update
39-
sudo apt-get -y install libtinfo5 libtinfo6 libncurses5 libncurses6
41+
sudo apt-get -y install libtinfo6 libncurses6
4042
4143
- name: Install ghc/cabal
4244
run: |
@@ -134,6 +136,8 @@ jobs:
134136
- name: Checkout code
135137
uses: actions/checkout@v4
136138

139+
- uses: haskell/ghcup-setup@v1
140+
137141
- name: Run build
138142
run: |
139143
bash .github/scripts/brew.sh git coreutils llvm@13 autoconf automake
@@ -144,7 +148,9 @@ jobs:
144148
export AR="$HOME/.brew/opt/llvm@13/bin/llvm-ar"
145149
export RANLIB="$HOME/.brew/opt/llvm@13/bin/llvm-ranlib"
146150
. .github/scripts/env.sh
147-
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
151+
ghcup install ghc --set ${{ matrix.ghc }}
152+
ghcup install cabal --set latest
153+
cabal update
148154
cabal test
149155
cabal bench
150156
env:
@@ -164,10 +170,14 @@ jobs:
164170
- name: Checkout code
165171
uses: actions/checkout@v4
166172

173+
- uses: haskell/ghcup-setup@v1
174+
167175
- name: Run build
168176
run: |
169-
pkg install -y curl gcc gmp gmake ncurses perl5 libffi libiconv git bash misc/compat10x misc/compat11x misc/compat12x gmake llvm14
177+
sudo pkg install -y curl gcc gmp gmake ncurses perl5 libffi libiconv git bash misc/compat10x misc/compat11x misc/compat12x gmake llvm14
170178
. .github/scripts/env.sh
171-
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
179+
ghcup install ghc --set ${{ matrix.ghc }}
180+
ghcup install cabal --set recommended
181+
cabal update
172182
cabal test
173183
cabal bench

0 commit comments

Comments
 (0)