Skip to content

Commit 4a3db53

Browse files
cydparsercydparser
authored
Merge pull request #87 from andreasabel/bytestring-0.12
Bump Haskell CI to latest GHCs: 9.6.2 9.4.5 9.2.8
2 parents da32f00 + 302b356 commit 4a3db53

4 files changed

Lines changed: 55 additions & 206 deletions

File tree

‎.github/workflows/haskell-ci.yml‎

Lines changed: 27 additions & 35 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.15.20230217
11+
# version: 0.16.4
1212
#
13-
# REGENDATA ("0.15.20230217",["github","io-streams.cabal"])
13+
# REGENDATA ("0.16.4",["github","io-streams.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -34,19 +34,19 @@ jobs:
3434
strategy:
3535
matrix:
3636
include:
37-
- compiler: ghc-9.6.0.20230210
37+
- compiler: ghc-9.6.2
3838
compilerKind: ghc
39-
compilerVersion: 9.6.0.20230210
39+
compilerVersion: 9.6.2
4040
setup-method: ghcup
41-
allow-failure: true
42-
- compiler: ghc-9.4.4
41+
allow-failure: false
42+
- compiler: ghc-9.4.5
4343
compilerKind: ghc
44-
compilerVersion: 9.4.4
44+
compilerVersion: 9.4.5
4545
setup-method: ghcup
4646
allow-failure: false
47-
- compiler: ghc-9.2.6
47+
- compiler: ghc-9.2.8
4848
compilerKind: ghc
49-
compilerVersion: 9.2.6
49+
compilerVersion: 9.2.8
5050
setup-method: ghcup
5151
allow-failure: false
5252
- compiler: ghc-9.0.2
@@ -112,20 +112,18 @@ jobs:
112112
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
113113
if [ "${{ matrix.setup-method }}" = ghcup ]; then
114114
mkdir -p "$HOME/.ghcup/bin"
115-
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
115+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
116116
chmod a+x "$HOME/.ghcup/bin/ghcup"
117-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
118117
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
119-
"$HOME/.ghcup/bin/ghcup" install cabal 3.9.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
118+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
120119
else
121120
apt-add-repository -y 'ppa:hvr/ghc'
122121
apt-get update
123122
apt-get install -y "$HCNAME"
124123
mkdir -p "$HOME/.ghcup/bin"
125-
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
124+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
126125
chmod a+x "$HOME/.ghcup/bin/ghcup"
127-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
128-
"$HOME/.ghcup/bin/ghcup" install cabal 3.9.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
126+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
129127
fi
130128
env:
131129
HCKIND: ${{ matrix.compilerKind }}
@@ -143,20 +141,20 @@ jobs:
143141
echo "HC=$HC" >> "$GITHUB_ENV"
144142
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
145143
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
146-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.9.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
144+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
147145
else
148146
HC=$HCDIR/bin/$HCKIND
149147
echo "HC=$HC" >> "$GITHUB_ENV"
150148
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
151149
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
152-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.9.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
150+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
153151
fi
154152
155153
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
156154
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
157155
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
158156
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
159-
if [ $((HCNUMVER >= 90600)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
157+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
160158
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
161159
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
162160
env:
@@ -185,18 +183,6 @@ jobs:
185183
repository hackage.haskell.org
186184
url: http://hackage.haskell.org/
187185
EOF
188-
if $HEADHACKAGE; then
189-
cat >> $CABAL_CONFIG <<EOF
190-
repository head.hackage.ghc.haskell.org
191-
url: https://ghc.gitlab.haskell.org/head.hackage/
192-
secure: True
193-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
194-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
195-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
196-
key-threshold: 3
197-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
198-
EOF
199-
fi
200186
cat >> $CABAL_CONFIG <<EOF
201187
program-default-options
202188
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -213,8 +199,8 @@ jobs:
213199
- name: install cabal-plan
214200
run: |
215201
mkdir -p $HOME/.cabal/bin
216-
curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.6.2.0/cabal-plan-0.6.2.0-x86_64-linux.xz > cabal-plan.xz
217-
echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c -
202+
curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.7.3.0/cabal-plan-0.7.3.0-x86_64-linux.xz > cabal-plan.xz
203+
echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c -
218204
xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
219205
rm -f cabal-plan.xz
220206
chmod a+x $HOME/.cabal/bin/cabal-plan
@@ -247,10 +233,8 @@ jobs:
247233
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package io-streams" >> cabal.project ; fi
248234
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
249235
cat >> cabal.project <<EOF
236+
allow-newer: bytestring
250237
EOF
251-
if $HEADHACKAGE; then
252-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
253-
fi
254238
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(io-streams)$/; }' >> cabal.project.local
255239
cat cabal.project
256240
cat cabal.project.local
@@ -288,6 +272,14 @@ jobs:
288272
run: |
289273
rm -f cabal.project.local
290274
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
275+
- name: prepare for constraint sets
276+
run: |
277+
rm -f cabal.project.local
278+
- name: constraint set bytestring-0.12
279+
run: |
280+
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring >= 0.12' --dependencies-only -j2 all ; fi
281+
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring >= 0.12' all ; fi
282+
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring >= 0.12' all ; fi
291283
- name: save cache
292284
uses: actions/cache/save@v3
293285
if: always()

‎.travis.yml‎

Lines changed: 0 additions & 167 deletions
This file was deleted.

‎cabal.haskell-ci‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,25 @@
11
branches: master ci*
2+
3+
constraint-set bytestring-0.12
4+
-- bytestring-0.12 requires base >=4.9 (GHC 8.0)
5+
ghc: >= 8.0
6+
constraints: bytestring >= 0.12
7+
--
8+
-- The following is silently ignored here:
9+
--
10+
-- raw-project
11+
-- allow-newer: bytestring
12+
--
13+
tests: True
14+
run-tests: True
15+
16+
-- The following is meant to be for constraint-set bytestring-0.12 only,
17+
-- but there is currently no way to enable `allow-newer: bytestring`
18+
-- just for the constraint set.
19+
--
20+
-- Since core library `bytestring` is constrained to `installed`,
21+
-- it is not harmful to allow newer `bytestring` in the default runs
22+
-- as well---it will have no effect there.
23+
--
24+
raw-project
25+
allow-newer: bytestring

‎io-streams.cabal‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ Maintainer: Gregory Collins <greg@gregorycollins.net>
88
Cabal-version: >= 1.10
99
Synopsis: Simple, composable, and easy-to-use stream I/O
1010
Tested-With:
11-
GHc == 9.6.0
12-
GHC == 9.4.4
13-
GHC == 9.2.6
11+
GHc == 9.6.2
12+
GHC == 9.4.5
13+
GHC == 9.2.8
1414
GHC == 9.0.2
1515
GHC == 8.10.7
1616
GHC == 8.8.4
@@ -141,7 +141,7 @@ Library
141141

142142
Build-depends: base >= 4 && <5,
143143
attoparsec >= 0.10 && <0.15,
144-
bytestring >= 0.9 && <0.12,
144+
bytestring >= 0.9 && <0.13,
145145
primitive >= 0.2 && <0.9,
146146
process >= 1.1 && <1.7,
147147
text >=0.10 && <1.3 || >= 2.0 && <2.1,

0 commit comments

Comments
 (0)