Skip to content

Commit 5173ca9

Browse files
phadejphadej
authored
Merge pull request #22 from phadej/ghc-9.6
Allow base-4.18, newer fin, vec, transformers
2 parents 2ff39e0 + c79ae9f commit 5173ca9

File tree

2 files changed

+39
-27
lines changed

2 files changed

+39
-27
lines changed

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

Lines changed: 31 additions & 20 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.20220822
11+
# version: 0.16
1212
#
13-
# REGENDATA ("0.15.20220822",["github","cabal.project"])
13+
# REGENDATA ("0.16",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,14 +32,19 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.4.1
35+
- compiler: ghc-9.6.1
3636
compilerKind: ghc
37-
compilerVersion: 9.4.1
37+
compilerVersion: 9.6.1
3838
setup-method: ghcup
3939
allow-failure: false
40-
- compiler: ghc-9.2.4
40+
- compiler: ghc-9.4.4
4141
compilerKind: ghc
42-
compilerVersion: 9.2.4
42+
compilerVersion: 9.4.4
43+
setup-method: ghcup
44+
allow-failure: false
45+
- compiler: ghc-9.2.7
46+
compilerKind: ghc
47+
compilerVersion: 9.2.7
4348
setup-method: ghcup
4449
allow-failure: false
4550
- compiler: ghc-9.0.2
@@ -115,18 +120,18 @@ jobs:
115120
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
116121
if [ "${{ matrix.setup-method }}" = ghcup ]; then
117122
mkdir -p "$HOME/.ghcup/bin"
118-
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
123+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
119124
chmod a+x "$HOME/.ghcup/bin/ghcup"
120125
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
121-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
126+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
122127
else
123128
apt-add-repository -y 'ppa:hvr/ghc'
124129
apt-get update
125130
apt-get install -y "$HCNAME"
126131
mkdir -p "$HOME/.ghcup/bin"
127-
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
132+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
128133
chmod a+x "$HOME/.ghcup/bin/ghcup"
129-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
134+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
130135
fi
131136
env:
132137
HCKIND: ${{ matrix.compilerKind }}
@@ -144,13 +149,13 @@ jobs:
144149
echo "HC=$HC" >> "$GITHUB_ENV"
145150
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
146151
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
147-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
152+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
148153
else
149154
HC=$HCDIR/bin/$HCKIND
150155
echo "HC=$HC" >> "$GITHUB_ENV"
151156
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
152157
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
153-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
158+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
154159
fi
155160
156161
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
@@ -202,23 +207,23 @@ jobs:
202207
- name: install cabal-plan
203208
run: |
204209
mkdir -p $HOME/.cabal/bin
205-
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
206-
echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c -
210+
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
211+
echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c -
207212
xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
208213
rm -f cabal-plan.xz
209214
chmod a+x $HOME/.cabal/bin/cabal-plan
210215
cabal-plan --version
211216
- name: install cabal-docspec
212217
run: |
213218
mkdir -p $HOME/.cabal/bin
214-
curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20211114/cabal-docspec-0.0.0.20211114.xz > cabal-docspec.xz
215-
echo 'e224700d9e8c9ec7ec6bc3f542ba433cd9925a5d356676c62a9bd1f2c8be8f8a cabal-docspec.xz' | sha256sum -c -
219+
curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20230406/cabal-docspec-0.0.0.20230406-x86_64-linux.xz > cabal-docspec.xz
220+
echo '68fa9addd5dc453d533a74a763950499d4593b1297c9a05c3ea5bd1acc04c9dd cabal-docspec.xz' | sha256sum -c -
216221
xz -d < cabal-docspec.xz > $HOME/.cabal/bin/cabal-docspec
217222
rm -f cabal-docspec.xz
218223
chmod a+x $HOME/.cabal/bin/cabal-docspec
219224
cabal-docspec --version
220225
- name: checkout
221-
uses: actions/checkout@v2
226+
uses: actions/checkout@v3
222227
with:
223228
path: source
224229
- name: initial cabal.project for sdist
@@ -254,8 +259,8 @@ jobs:
254259
run: |
255260
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
256261
cabal-plan
257-
- name: cache
258-
uses: actions/cache@v2
262+
- name: restore cache
263+
uses: actions/cache/restore@v3
259264
with:
260265
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
261266
path: ~/.cabal/store
@@ -283,7 +288,7 @@ jobs:
283288
${CABAL} -vnormal check
284289
- name: haddock
285290
run: |
286-
$CABAL v2-haddock --haddock-all $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
287292
- name: unconstrained build
288293
run: |
289294
rm -f cabal.project.local
@@ -299,3 +304,9 @@ jobs:
299304
run: |
300305
if [ $((HCNUMVER >= 70800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='rere -rere-cfg' --dependencies-only -j2 all ; fi
301306
if [ $((HCNUMVER >= 70800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='rere -rere-cfg' all ; fi
307+
- name: save cache
308+
uses: actions/cache/save@v3
309+
if: always()
310+
with:
311+
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
312+
path: ~/.cabal/store

‎rere.cabal‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: 2.2
22
name: rere
33
version: 0.2
4-
x-revision: 2
4+
x-revision: 3
55
synopsis:
66
Regular-expressions extended with fixpoints for context-free powers
77

@@ -33,8 +33,9 @@ tested-with:
3333
|| ==8.8.4
3434
|| ==8.10.7
3535
|| ==9.0.2
36-
|| ==9.2.4
37-
|| ==9.4.1
36+
|| ==9.2.7
37+
|| ==9.4.4
38+
|| ==9.6.1
3839

3940
source-repository head
4041
type: git
@@ -60,10 +61,10 @@ library
6061

6162
-- GHC boot libraries
6263
build-depends:
63-
, base >=4.3.0.0 && <4.18
64+
, base >=4.3.0.0 && <4.19
6465
, containers ^>=0.4.0.0 || ^>=0.5.0.0 || ^>=0.6.0.1
6566
, parsec ^>=3.1.12.0
66-
, transformers ^>=0.3.0.0 || ^>=0.4.2.0 || ^>=0.5.2.0
67+
, transformers ^>=0.3.0.0 || ^>=0.4.2.0 || ^>=0.5.2.0 || ^>=0.6.1.0
6768

6869
-- other dependencies
6970
build-depends: QuickCheck ^>=2.14.2
@@ -97,8 +98,8 @@ library
9798

9899
if (flag(rere-cfg) && impl(ghc >=7.8))
99100
build-depends:
100-
, fin ^>=0.2
101-
, vec ^>=0.4
101+
, fin ^>=0.2 || ^>=0.3
102+
, vec ^>=0.4 || ^>=0.5
102103

103104
exposed-modules: RERE.CFG
104105

0 commit comments

Comments
 (0)