Skip to content

Commit c245f9d

Browse files
BodigrimBodigrim
committed
Regenerate CI
1 parent 5311507 commit c245f9d

File tree

2 files changed

+52
-18
lines changed

2 files changed

+52
-18
lines changed

‎.github/workflows/haskell-ci.yml

Lines changed: 49 additions & 17 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.14.3
11+
# version: 0.15.20230127
1212
#
13-
# REGENDATA ("0.14.3",["github","zlib.cabal"])
13+
# REGENDATA ("0.15.20230127",["github","zlib.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -19,7 +19,7 @@ on:
1919
jobs:
2020
linux:
2121
name: Haskell-CI - Linux - ${{ matrix.compiler }}
22-
runs-on: ubuntu-18.04
22+
runs-on: ubuntu-20.04
2323
timeout-minutes:
2424
60
2525
container:
@@ -28,9 +28,19 @@ jobs:
2828
strategy:
2929
matrix:
3030
include:
31-
- compiler: ghc-9.2.2
31+
- compiler: ghc-9.6.0.20230111
3232
compilerKind: ghc
33-
compilerVersion: 9.2.2
33+
compilerVersion: 9.6.0.20230111
34+
setup-method: ghcup
35+
allow-failure: true
36+
- compiler: ghc-9.4.4
37+
compilerKind: ghc
38+
compilerVersion: 9.4.4
39+
setup-method: ghcup
40+
allow-failure: false
41+
- compiler: ghc-9.2.5
42+
compilerKind: ghc
43+
compilerVersion: 9.2.5
3444
setup-method: ghcup
3545
allow-failure: false
3646
- compiler: ghc-9.0.2
@@ -106,20 +116,21 @@ jobs:
106116
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
107117
if [ "${{ matrix.setup-method }}" = ghcup ]; then
108118
mkdir -p "$HOME/.ghcup/bin"
109-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup"
119+
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
110120
chmod a+x "$HOME/.ghcup/bin/ghcup"
111-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
112-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
121+
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
122+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
123+
"$HOME/.ghcup/bin/ghcup" install cabal 3.9.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
113124
apt-get update
114125
apt-get install -y zlib1g-dev
115126
else
116127
apt-add-repository -y 'ppa:hvr/ghc'
117128
apt-get update
118129
apt-get install -y "$HCNAME" zlib1g-dev
119130
mkdir -p "$HOME/.ghcup/bin"
120-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup"
131+
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
121132
chmod a+x "$HOME/.ghcup/bin/ghcup"
122-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
133+
"$HOME/.ghcup/bin/ghcup" install cabal 3.9.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
123134
fi
124135
env:
125136
HCKIND: ${{ matrix.compilerKind }}
@@ -137,20 +148,20 @@ jobs:
137148
echo "HC=$HC" >> "$GITHUB_ENV"
138149
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
139150
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
140-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
151+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.9.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
141152
else
142153
HC=$HCDIR/bin/$HCKIND
143154
echo "HC=$HC" >> "$GITHUB_ENV"
144155
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
145156
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
146-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
157+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.9.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
147158
fi
148159
149160
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
150161
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
151162
if [ $((HCNUMVER >= 70400)) -ne 0 ] ; then echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" ; else echo "ARG_TESTS=--disable-tests" >> "$GITHUB_ENV" ; fi
152163
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
153-
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
164+
if [ $((HCNUMVER >= 90600)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
154165
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
155166
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
156167
env:
@@ -179,6 +190,18 @@ jobs:
179190
repository hackage.haskell.org
180191
url: http://hackage.haskell.org/
181192
EOF
193+
if $HEADHACKAGE; then
194+
cat >> $CABAL_CONFIG <<EOF
195+
repository head.hackage.ghc.haskell.org
196+
url: https://ghc.gitlab.haskell.org/head.hackage/
197+
secure: True
198+
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
199+
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
200+
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
201+
key-threshold: 3
202+
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
203+
EOF
204+
fi
182205
cat >> $CABAL_CONFIG <<EOF
183206
program-default-options
184207
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -202,7 +225,7 @@ jobs:
202225
chmod a+x $HOME/.cabal/bin/cabal-plan
203226
cabal-plan --version
204227
- name: checkout
205-
uses: actions/checkout@v2
228+
uses: actions/checkout@v3
206229
with:
207230
path: source
208231
- name: initial cabal.project for sdist
@@ -230,15 +253,18 @@ jobs:
230253
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
231254
cat >> cabal.project <<EOF
232255
EOF
256+
if $HEADHACKAGE; then
257+
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
258+
fi
233259
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(zlib)$/; }' >> cabal.project.local
234260
cat cabal.project
235261
cat cabal.project.local
236262
- name: dump install plan
237263
run: |
238264
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
239265
cabal-plan
240-
- name: cache
241-
uses: actions/cache@v2
266+
- name: restore cache
267+
uses: actions/cache/restore@v3
242268
with:
243269
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
244270
path: ~/.cabal/store
@@ -262,8 +288,14 @@ jobs:
262288
${CABAL} -vnormal check
263289
- name: haddock
264290
run: |
265-
$CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
291+
$CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
266292
- name: unconstrained build
267293
run: |
268294
rm -f cabal.project.local
269295
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
296+
- name: save cache
297+
uses: actions/cache/save@v3
298+
if: always()
299+
with:
300+
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
301+
path: ~/.cabal/store

‎zlib.cabal

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ tested-with: GHC == 7.0.4
3535
, GHC == 8.8.4
3636
, GHC == 8.10.7
3737
, GHC == 9.0.2
38-
, GHC == 9.2.2
38+
, GHC == 9.2.5
39+
, GHC == 9.4.4
40+
, GHC == 9.6.1
3941

4042
extra-source-files: changelog
4143
README.md

0 commit comments

Comments
 (0)