Skip to content

Commit b8c693d

Browse files
committed
Improve CI
1 parent d808c80 commit b8c693d

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

.github/workflows/haskell.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,15 +123,14 @@ jobs:
123123
ghc_version: 9.6.0.20230128
124124
ghcup_release_channel: "https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml"
125125
runner: ubuntu-latest
126-
cabal_version: 3.8.1.0
126+
cabal_version: 3.9
127127

128-
# [TODO] Use latest cabal (pre-)release
129128
- name: head
130129
ghc_version: head
131-
# ghcup_release_channel: "https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml"
130+
ghcup_release_channel: "https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml"
132131
runner: ubuntu-latest
133-
# cabal_version: 3.9.0.0
134-
cabal_version: latest
132+
# [WARNING] Ensure to use latest cabal (pre-)release
133+
cabal_version: 3.9
135134

136135
- name: hlint
137136
pack_options: HLINT_OPTIONS="lint" HLINT_TARGETS="lib exe"
@@ -148,6 +147,7 @@ jobs:
148147
ghcup-release-channel: ${{ matrix.ghcup_release_channel }}
149148
cabal-version: ${{ matrix.cabal_version }}
150149

150+
# [TODO] Use haskell/actions/setup when it supports reliably GHC head.
151151
# Adapted from https://github.com/composewell/streamly/blob/master/.github/workflows/haskell.yml
152152
- name: Install GHC head environment
153153
if: ${{ matrix.ghc_version == 'head' }}
@@ -164,6 +164,8 @@ jobs:
164164
GHCUP_VER=0.1.19.0
165165
$CURL -sL -o ./ghcup https://downloads.haskell.org/~ghcup/$GHCUP_VER/${GHCUP_ARCH}-ghcup-$GHCUP_VER
166166
chmod +x ./ghcup
167+
# Set ghcup pre-release
168+
./ghcup config add-release-channel ${{ matrix.ghcup_release_channel }}
167169
# Install GHC head
168170
# The URL may change, to find a working URL go to https://gitlab.haskell.org/ghc/ghc/-/jobs/
169171
# Find a debian10 job, click on a passed/failed job, at the

0 commit comments

Comments
 (0)