Skip to content

Commit e9d41c8

Browse files
committed
ci: Use latest cabal-install for quick-jobs
This matches the installation logic for the validate jobs.
1 parent e8e66c9 commit e9d41c8

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

.github/workflows/quick-jobs.yml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ jobs:
2929
gen-spdx
3030
gen-spdx-exc
3131
steps:
32-
- name: ghcup
33-
run: |
34-
ghcup --version
35-
ghcup config set cache true
36-
ghcup install ghc $GHC_FOR_QUICK_JOBS
37-
ghcup set ghc $GHC_FOR_QUICK_JOBS
32+
- name: Install primary compiler
33+
uses: haskell-actions/setup@v2
34+
id: setup-haskell
35+
with:
36+
ghc-version: ${{ env.GHC_FOR_QUICK_JOBS }}
37+
cabal-version: latest
3838
- name: Haskell versions
3939
run: |
4040
ghc --version
@@ -72,12 +72,12 @@ jobs:
7272
name: Doctest Cabal
7373
runs-on: ubuntu-latest
7474
steps:
75-
- name: ghcup
76-
run: |
77-
ghcup --version
78-
ghcup config set cache true
79-
ghcup install ghc $GHC_FOR_QUICK_JOBS
80-
ghcup set ghc $GHC_FOR_QUICK_JOBS
75+
- name: Install primary compiler
76+
uses: haskell-actions/setup@v2
77+
id: setup-haskell
78+
with:
79+
ghc-version: ${{ env.GHC_FOR_QUICK_JOBS }}
80+
cabal-version: latest
8181
- name: Haskell versions
8282
run: |
8383
ghc --version
@@ -117,12 +117,12 @@ jobs:
117117
env:
118118
cabal_build: cabal build buildinfo-reference-generator
119119
steps:
120-
- name: ghcup
121-
run: |
122-
ghcup --version
123-
ghcup config set cache true
124-
ghcup install ghc $GHC_FOR_QUICK_JOBS
125-
ghcup set ghc $GHC_FOR_QUICK_JOBS
120+
- name: Install primary compiler
121+
uses: haskell-actions/setup@v2
122+
id: setup-haskell
123+
with:
124+
ghc-version: ${{ env.GHC_FOR_QUICK_JOBS }}
125+
cabal-version: latest
126126
- name: Haskell versions
127127
run: |
128128
ghc --version
@@ -154,12 +154,12 @@ jobs:
154154
name: Check Release Project
155155
runs-on: ubuntu-latest
156156
steps:
157-
- name: ghcup
158-
run: |
159-
ghcup --version
160-
ghcup config set cache true
161-
ghcup install ghc $GHC_FOR_QUICK_JOBS
162-
ghcup set ghc $GHC_FOR_QUICK_JOBS
157+
- name: Install primary compiler
158+
uses: haskell-actions/setup@v2
159+
id: setup-haskell
160+
with:
161+
ghc-version: ${{ env.GHC_FOR_QUICK_JOBS }}
162+
cabal-version: latest
163163
- name: Haskell versions
164164
run: |
165165
ghc --version

0 commit comments

Comments
 (0)