Skip to content

Commit e6193e2

Browse files
sjakobitreeowl
authored andcommitted
Add GHC 9.2.1 to CI
1 parent d90ed09 commit e6193e2

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This GitHub workflow config has been generated by a script via
22
#
3-
# haskell-ci 'github' '--benchmarks-jobs= >=7.10' '--installed=-containers' '--installed=-binary' 'unordered-containers.cabal' '--branches=master'
3+
# haskell-ci 'github' '--benchmarks-jobs= < 9.2' '--installed=-containers' '--installed=-binary' 'unordered-containers.cabal' '--branches=master'
44
#
55
# To regenerate the script (for example after adjusting tested-with) run
66
#
@@ -10,7 +10,7 @@
1010
#
1111
# version: 0.13.20211030
1212
#
13-
# REGENDATA ("0.13.20211030",["github","--benchmarks-jobs= >=7.10","--installed=-containers","--installed=-binary","unordered-containers.cabal","--branches=master"])
13+
# REGENDATA ("0.13.20211030",["github","--benchmarks-jobs= < 9.2","--installed=-containers","--installed=-binary","unordered-containers.cabal","--branches=master"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -30,6 +30,11 @@ jobs:
3030
strategy:
3131
matrix:
3232
include:
33+
- compiler: ghc-9.2.1
34+
compilerKind: ghc
35+
compilerVersion: 9.2.1
36+
setup-method: ghcup
37+
allow-failure: false
3338
- compiler: ghc-9.0.1
3439
compilerKind: ghc
3540
compilerVersion: 9.0.1
@@ -114,7 +119,7 @@ jobs:
114119
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
115120
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
116121
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
117-
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
122+
if [ $((HCNUMVER < 90200)) -ne 0 ] ; then echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV" ; else echo "ARG_BENCH=--disable-benchmarks" >> "$GITHUB_ENV" ; fi
118123
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
119124
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
120125
echo "GHCJSARITH=0" >> "$GITHUB_ENV"

unordered-containers.cabal

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ cabal-version: >=1.10
2929
extra-source-files: CHANGES.md
3030

3131
tested-with:
32-
GHC ==9.0.1
32+
GHC ==9.2.1
33+
|| ==9.0.1
3334
|| ==8.10.7
3435
|| ==8.8.4
3536
|| ==8.6.5

0 commit comments

Comments
 (0)