Skip to content

Commit 04f2878

Browse files
committed
F
1 parent 46e9dcf commit 04f2878

File tree

1 file changed

+6
-21
lines changed

1 file changed

+6
-21
lines changed

.github/workflows/test.yaml

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,7 @@ jobs:
3232
steps:
3333
- uses: actions/checkout@v3
3434

35-
- uses: actions/checkout@v4
36-
with:
37-
repository: andreabedini/haskell-actions
38-
path: ghcup
39-
- uses: ./ghcup/ghcup
35+
- uses: haskell/ghcup-setup@v1
4036

4137
- name: Install dependencies (Ubuntu)
4238
if: runner.os == 'Linux'
@@ -83,12 +79,7 @@ jobs:
8379
run: |
8480
apt-get update -y
8581
apt-get install -y autoconf build-essential zlib1g-dev libgmp-dev curl libtinfo-dev git
86-
- uses: actions/checkout@v1
87-
with:
88-
repository: andreabedini/haskell-actions
89-
ref: 'main'
90-
path: ghcup
91-
- uses: ./../ghcup/ghcup
82+
- uses: haskell/ghcup-setup@v1
9283
- uses: actions/checkout@v1
9384
- name: Test
9485
run: |
@@ -146,11 +137,7 @@ jobs:
146137
- name: Checkout code
147138
uses: actions/checkout@v4
148139

149-
- uses: actions/checkout@v4
150-
with:
151-
repository: andreabedini/haskell-actions
152-
path: ghcup
153-
- uses: ./ghcup/ghcup
140+
- uses: haskell/ghcup-setup@v1
154141

155142
- name: Run build
156143
run: |
@@ -184,16 +171,14 @@ jobs:
184171
- name: Checkout code
185172
uses: actions/checkout@v4
186173

187-
- uses: actions/checkout@v4
188-
with:
189-
repository: andreabedini/haskell-actions
190-
path: ghcup
191-
- uses: ./ghcup/ghcup
174+
- uses: haskell/ghcup-setup@v1
192175

193176
- name: Run build
194177
run: |
195178
sudo pkg install -y curl gcc gmp gmake ncurses perl5 libffi libiconv git bash misc/compat10x misc/compat11x misc/compat12x gmake llvm14
196179
. .github/scripts/env.sh
197180
ghcup install ghc --set ${{ matrix.ghc }}
181+
ghcup install cabal --set recommended
182+
cabal update
198183
cabal test
199184
cabal bench

0 commit comments

Comments
 (0)