Skip to content

Commit 84ce469

Browse files
committed
Regenerate CI
1 parent 364bdb2 commit 84ce469

File tree

2 files changed

+30
-41
lines changed

2 files changed

+30
-41
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 18 additions & 39 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.20241202
11+
# version: 0.19.20241223
1212
#
13-
# REGENDATA ("0.19.20241202",["github","cabal.project"])
13+
# REGENDATA ("0.19.20241223",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -28,10 +28,10 @@ jobs:
2828
strategy:
2929
matrix:
3030
include:
31-
- compiler: ghc-9.12.0.20241128
31+
- compiler: ghc-9.12.1
3232
compilerKind: ghc
33-
compilerVersion: 9.12.0.20241128
34-
setup-method: ghcup-prerelease
33+
compilerVersion: 9.12.1
34+
setup-method: ghcup
3535
allow-failure: false
3636
- compiler: ghc-9.10.1
3737
compilerKind: ghc
@@ -96,8 +96,8 @@ jobs:
9696
chmod a+x "$HOME/.ghcup/bin/ghcup"
9797
- name: Install cabal-install
9898
run: |
99-
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
100-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
99+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
100+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
101101
- name: Install GHC (GHCup)
102102
if: matrix.setup-method == 'ghcup'
103103
run: |
@@ -112,21 +112,6 @@ jobs:
112112
HCKIND: ${{ matrix.compilerKind }}
113113
HCNAME: ${{ matrix.compiler }}
114114
HCVER: ${{ matrix.compilerVersion }}
115-
- name: Install GHC (GHCup prerelease)
116-
if: matrix.setup-method == 'ghcup-prerelease'
117-
run: |
118-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
119-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
120-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
121-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
122-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
123-
echo "HC=$HC" >> "$GITHUB_ENV"
124-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
125-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
126-
env:
127-
HCKIND: ${{ matrix.compilerKind }}
128-
HCNAME: ${{ matrix.compiler }}
129-
HCVER: ${{ matrix.compilerVersion }}
130115
- name: Set PATH and environment variables
131116
run: |
132117
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
@@ -137,7 +122,7 @@ jobs:
137122
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
138123
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
139124
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
140-
if [ $((HCNUMVER >= 91200)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
125+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
141126
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
142127
env:
143128
HCKIND: ${{ matrix.compilerKind }}
@@ -165,18 +150,6 @@ jobs:
165150
repository hackage.haskell.org
166151
url: http://hackage.haskell.org/
167152
EOF
168-
if $HEADHACKAGE; then
169-
cat >> $CABAL_CONFIG <<EOF
170-
repository head.hackage.ghc.haskell.org
171-
url: https://ghc.gitlab.haskell.org/head.hackage/
172-
secure: True
173-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
174-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
175-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
176-
key-threshold: 3
177-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
178-
EOF
179-
fi
180153
cat >> $CABAL_CONFIG <<EOF
181154
program-default-options
182155
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -233,11 +206,17 @@ jobs:
233206
echo "package javascript-bridge-benchmarks" >> cabal.project
234207
echo " ghc-options: -Werror=missing-methods" >> cabal.project
235208
cat >> cabal.project <<EOF
236-
allow-newer: websockets:containers
209+
allow-newer: aeson:ghc-prim
210+
allow-newer: aeson:template-haskell
211+
allow-newer: binary-orphans:base
212+
allow-newer: indexed-traversable:base
213+
allow-newer: indexed-traversable-instances:base
214+
allow-newer: integer-conversion:base
215+
allow-newer: microstache:base
216+
allow-newer: semialign:base
217+
allow-newer: these:base
218+
allow-newer: uuid-types:template-haskell
237219
EOF
238-
if $HEADHACKAGE; then
239-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
240-
fi
241220
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(javascript-bridge|javascript-bridge-benchmarks)$/; }' >> cabal.project.local
242221
cat cabal.project
243222
cat cabal.project.local

cabal.project

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
packages: .
22
./benchmarks
33

4-
-- Workaround until https://github.com/jaspervdj/websockets/pull/254 is merged
5-
allow-newer: websockets:containers
4+
-- TODO: Remove this once the ecosystem has caught up with GHC 9.12
5+
allow-newer:
6+
aeson:ghc-prim,
7+
aeson:template-haskell,
8+
binary-orphans:base,
9+
indexed-traversable:base,
10+
indexed-traversable-instances:base,
11+
integer-conversion:base,
12+
microstache:base,
13+
semialign:base,
14+
these:base,
15+
uuid-types:template-haskell

0 commit comments

Comments
 (0)