Skip to content

Commit ff31f14

Browse files
andreasabelBodigrim
authored andcommitted
Haskell-CI for 9.2-rc1
1 parent d156315 commit ff31f14

File tree

2 files changed

+36
-9
lines changed

2 files changed

+36
-9
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 25 additions & 6 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.13.20210606
11+
# version: 0.13.20210901
1212
#
13-
# REGENDATA ("0.13.20210606",["github","--config=cabal.haskell-ci","text.cabal"])
13+
# REGENDATA ("0.13.20210901",["github","--config=cabal.haskell-ci","text.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -26,14 +26,19 @@ jobs:
2626
strategy:
2727
matrix:
2828
include:
29+
- compiler: ghc-9.2.0.20210821
30+
compilerKind: ghc
31+
compilerVersion: 9.2.0.20210821
32+
setup-method: ghcup
33+
allow-failure: true
2934
- compiler: ghc-9.0.1
3035
compilerKind: ghc
3136
compilerVersion: 9.0.1
3237
setup-method: ghcup
3338
allow-failure: false
34-
- compiler: ghc-8.10.4
39+
- compiler: ghc-8.10.7
3540
compilerKind: ghc
36-
compilerVersion: 8.10.4
41+
compilerVersion: 8.10.7
3742
setup-method: ghcup
3843
allow-failure: false
3944
- compiler: ghc-8.8.4
@@ -68,7 +73,7 @@ jobs:
6873
apt-get update
6974
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
7075
mkdir -p "$HOME/.ghcup/bin"
71-
curl -sL https://downloads.haskell.org/ghcup/0.1.14.1/x86_64-linux-ghcup-0.1.14.1 > "$HOME/.ghcup/bin/ghcup"
76+
curl -sL https://downloads.haskell.org/ghcup/0.1.16.2/x86_64-linux-ghcup-0.1.16.2 > "$HOME/.ghcup/bin/ghcup"
7277
chmod a+x "$HOME/.ghcup/bin/ghcup"
7378
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
7479
"$HOME/.ghcup/bin/ghcup" install cabal 3.4.0.0
@@ -92,7 +97,7 @@ jobs:
9297
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
9398
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
9499
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
95-
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
100+
if [ $((HCNUMVER >= 90200)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
96101
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
97102
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
98103
env:
@@ -121,6 +126,17 @@ jobs:
121126
repository hackage.haskell.org
122127
url: http://hackage.haskell.org/
123128
EOF
129+
if $HEADHACKAGE; then
130+
cat >> $CABAL_CONFIG <<EOF
131+
repository head.hackage.ghc.haskell.org
132+
url: https://ghc.gitlab.haskell.org/head.hackage/
133+
secure: True
134+
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
135+
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
136+
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
137+
key-threshold: 3
138+
EOF
139+
fi
124140
cat $CABAL_CONFIG
125141
- name: versions
126142
run: |
@@ -177,6 +193,9 @@ jobs:
177193
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
178194
cat >> cabal.project <<EOF
179195
EOF
196+
if $HEADHACKAGE; then
197+
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
198+
fi
180199
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(text)$/; }' >> cabal.project.local
181200
cat cabal.project
182201
cat cabal.project.local

text.cabal

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,17 @@ maintainer: Haskell Text Team <[email protected]>, Core Libraries
4545
copyright: 2009-2011 Bryan O'Sullivan, 2008-2009 Tom Harper, 2021 Andrew Lelechenko
4646
category: Data, Text
4747
build-type: Simple
48-
tested-with: GHC==9.0.1,
49-
GHC==8.10.4, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4,
50-
GHC==8.2.2, GHC==8.0.2
48+
tested-with:
49+
GHC == 8.0.2
50+
GHC == 8.2.2
51+
GHC == 8.4.4
52+
GHC == 8.6.5
53+
GHC == 8.8.4
54+
GHC == 8.10.7
55+
GHC == 9.0.1
56+
GHC == 9.2.0.20210821
57+
-- this is GHC-9.2-rc1
58+
5159
extra-source-files:
5260
-- scripts/CaseFolding.txt
5361
-- scripts/SpecialCasing.txt

0 commit comments

Comments
 (0)