Skip to content

Commit 2a48a93

Browse files
committed
Update CI
1 parent b5cb922 commit 2a48a93

File tree

2 files changed

+8
-39
lines changed

2 files changed

+8
-39
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 7 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#
99
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.19.20251118
11+
# version: 0.19.20260104
1212
#
13-
# REGENDATA ("0.19.20251118",["github","--config=cabal.haskell-ci","cabal.project"])
13+
# REGENDATA ("0.19.20260104",["github","--config=cabal.haskell-ci","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -41,10 +41,10 @@ jobs:
4141
strategy:
4242
matrix:
4343
include:
44-
- compiler: ghc-9.14.0.20251104
44+
- compiler: ghc-9.14.1
4545
compilerKind: ghc
46-
compilerVersion: 9.14.0.20251104
47-
setup-method: ghcup-prerelease
46+
compilerVersion: 9.14.1
47+
setup-method: ghcup
4848
allow-failure: false
4949
- compiler: ghc-9.12.2
5050
compilerKind: ghc
@@ -105,21 +105,6 @@ jobs:
105105
HCKIND: ${{ matrix.compilerKind }}
106106
HCNAME: ${{ matrix.compiler }}
107107
HCVER: ${{ matrix.compilerVersion }}
108-
- name: Install GHC (GHCup prerelease)
109-
if: matrix.setup-method == 'ghcup-prerelease'
110-
run: |
111-
"$HOME/.ghcup/bin/ghcup" config add-release-channel prereleases
112-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
113-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
114-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
115-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
116-
echo "HC=$HC" >> "$GITHUB_ENV"
117-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
118-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
119-
env:
120-
HCKIND: ${{ matrix.compilerKind }}
121-
HCNAME: ${{ matrix.compiler }}
122-
HCVER: ${{ matrix.compilerVersion }}
123108
- name: Set PATH and environment variables
124109
run: |
125110
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
@@ -130,7 +115,7 @@ jobs:
130115
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
131116
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
132117
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
133-
if [ $((HCNUMVER >= 91400)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
118+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
134119
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
135120
env:
136121
HCKIND: ${{ matrix.compilerKind }}
@@ -158,18 +143,6 @@ jobs:
158143
repository hackage.haskell.org
159144
url: http://hackage.haskell.org/
160145
EOF
161-
if $HEADHACKAGE; then
162-
cat >> $CABAL_CONFIG <<EOF
163-
repository head.hackage.ghc.haskell.org
164-
url: https://ghc.gitlab.haskell.org/head.hackage/
165-
secure: True
166-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
167-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
168-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
169-
key-threshold: 3
170-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
171-
EOF
172-
fi
173146
cat >> $CABAL_CONFIG <<EOF
174147
program-default-options
175148
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -225,12 +198,9 @@ jobs:
225198
echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project
226199
cat >> cabal.project <<EOF
227200
allow-newer: *:base
228-
allow-newer: *:ghc-prim
201+
allow-newer: *:containers
229202
allow-newer: *:template-haskell
230203
EOF
231-
if $HEADHACKAGE; then
232-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
233-
fi
234204
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(hpqtypes)$/; }' >> cabal.project.local
235205
cat cabal.project
236206
cat cabal.project.local

cabal.project

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
packages: .
22

3-
-- GHC 9.6
43
allow-newer: *:base
5-
, *:ghc-prim
4+
, *:containers
65
, *:template-haskell
76

87
tests: True

0 commit comments

Comments
 (0)