Skip to content

Commit 402c8da

Browse files
phadejphadej
authored
Merge pull request #157 from well-typed/ghc-9.4
Allow base-4.17 and others GHC-9.4 bundled package versions
2 parents 615e46a + 773f1c0 commit 402c8da

File tree

3 files changed

+32
-27
lines changed

3 files changed

+32
-27
lines changed

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

Lines changed: 26 additions & 21 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.20211113
11+
# version: 0.15.20220822
1212
#
13-
# REGENDATA ("0.13.20211113",["github","--config=cabal.haskell-ci","--benchmarks-jobs=<9.0","cabal.project"])
13+
# REGENDATA ("0.15.20220822",["github","--config=cabal.haskell-ci","--benchmarks-jobs=<9.0","cabal.project"])
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,20 +28,25 @@ jobs:
2828
strategy:
2929
matrix:
3030
include:
31-
- compiler: ghc-9.2.1
31+
- compiler: ghc-9.4.1
3232
compilerKind: ghc
33-
compilerVersion: 9.2.1
33+
compilerVersion: 9.4.1
3434
setup-method: ghcup
3535
allow-failure: false
36-
- compiler: ghc-9.0.1
36+
- compiler: ghc-9.2.4
3737
compilerKind: ghc
38-
compilerVersion: 9.0.1
39-
setup-method: hvr-ppa
38+
compilerVersion: 9.2.4
39+
setup-method: ghcup
4040
allow-failure: false
41-
- compiler: ghc-8.10.4
41+
- compiler: ghc-9.0.2
4242
compilerKind: ghc
43-
compilerVersion: 8.10.4
44-
setup-method: hvr-ppa
43+
compilerVersion: 9.0.2
44+
setup-method: ghcup
45+
allow-failure: false
46+
- compiler: ghc-8.10.7
47+
compilerKind: ghc
48+
compilerVersion: 8.10.7
49+
setup-method: ghcup
4550
allow-failure: false
4651
- compiler: ghc-8.8.2
4752
compilerKind: ghc
@@ -76,18 +81,18 @@ jobs:
7681
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
7782
if [ "${{ matrix.setup-method }}" = ghcup ]; then
7883
mkdir -p "$HOME/.ghcup/bin"
79-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
84+
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
8085
chmod a+x "$HOME/.ghcup/bin/ghcup"
81-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
82-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
86+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
87+
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
8388
else
8489
apt-add-repository -y 'ppa:hvr/ghc'
8590
apt-get update
8691
apt-get install -y "$HCNAME"
8792
mkdir -p "$HOME/.ghcup/bin"
88-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
93+
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
8994
chmod a+x "$HOME/.ghcup/bin/ghcup"
90-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
95+
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
9196
fi
9297
env:
9398
HCKIND: ${{ matrix.compilerKind }}
@@ -163,7 +168,7 @@ jobs:
163168
- name: cache (tools)
164169
uses: actions/cache@v2
165170
with:
166-
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-fc3fb5d3
171+
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-9e28e5ef
167172
path: ~/.haskell-ci-tools
168173
- name: install cabal-plan
169174
run: |
@@ -176,7 +181,7 @@ jobs:
176181
cabal-plan --version
177182
- name: install doctest
178183
run: |
179-
if [ $((HCNUMVER < 90000)) -ne 0 ] ; then $CABAL --store-dir=$HOME/.haskell-ci-tools/store v2-install $ARG_COMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.17' ; fi
184+
if [ $((HCNUMVER < 90000)) -ne 0 ] ; then $CABAL --store-dir=$HOME/.haskell-ci-tools/store v2-install $ARG_COMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.20' ; fi
180185
if [ $((HCNUMVER < 90000)) -ne 0 ] ; then doctest --version ; fi
181186
- name: checkout
182187
uses: actions/checkout@v2
@@ -242,9 +247,9 @@ jobs:
242247
- name: doctest
243248
run: |
244249
if [ $((HCNUMVER < 90000)) -ne 0 ] ; then cd ${PKGDIR_sop_core} || false ; fi
245-
if [ $((HCNUMVER < 90000)) -ne 0 ] ; then doctest --preserve-it -XCPP -XScopedTypeVariables -XTypeFamilies -XRankNTypes -XTypeOperators -XGADTs -XConstraintKinds -XMultiParamTypeClasses -XTypeSynonymInstances -XFlexibleInstances -XFlexibleContexts -XDeriveFunctor -XDeriveFoldable -XDeriveTraversable -XDefaultSignatures -XKindSignatures -XDataKinds -XFunctionalDependencies -XAutoDeriveTypeable src ; fi
250+
if [ $((HCNUMVER < 90000)) -ne 0 ] ; then doctest --preserve-it -XHaskell2010 -XCPP -XScopedTypeVariables -XTypeFamilies -XRankNTypes -XTypeOperators -XGADTs -XConstraintKinds -XMultiParamTypeClasses -XTypeSynonymInstances -XFlexibleInstances -XFlexibleContexts -XDeriveFunctor -XDeriveFoldable -XDeriveTraversable -XDefaultSignatures -XKindSignatures -XDataKinds -XFunctionalDependencies -XAutoDeriveTypeable src ; fi
246251
if [ $((HCNUMVER < 90000)) -ne 0 ] ; then cd ${PKGDIR_generics_sop} || false ; fi
247-
if [ $((HCNUMVER < 90000)) -ne 0 ] ; then doctest --preserve-it -XCPP -XScopedTypeVariables -XTypeFamilies -XRankNTypes -XTypeOperators -XGADTs -XConstraintKinds -XMultiParamTypeClasses -XTypeSynonymInstances -XFlexibleInstances -XFlexibleContexts -XDeriveFunctor -XDeriveFoldable -XDeriveTraversable -XDefaultSignatures -XKindSignatures -XDataKinds -XFunctionalDependencies -XAutoDeriveTypeable src ; fi
252+
if [ $((HCNUMVER < 90000)) -ne 0 ] ; then doctest --preserve-it -XHaskell2010 -XCPP -XScopedTypeVariables -XTypeFamilies -XRankNTypes -XTypeOperators -XGADTs -XConstraintKinds -XMultiParamTypeClasses -XTypeSynonymInstances -XFlexibleInstances -XFlexibleContexts -XDeriveFunctor -XDeriveFoldable -XDeriveTraversable -XDefaultSignatures -XKindSignatures -XDataKinds -XFunctionalDependencies -XAutoDeriveTypeable src ; fi
248253
- name: cabal check
249254
run: |
250255
cd ${PKGDIR_sop_core} || false
@@ -253,7 +258,7 @@ jobs:
253258
${CABAL} -vnormal check
254259
- name: haddock
255260
run: |
256-
$CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
261+
$CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
257262
- name: unconstrained build
258263
run: |
259264
rm -f cabal.project.local

‎generics-sop/generics-sop.cabal‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ category: Generics
4242
build-type: Simple
4343
cabal-version: >=1.10
4444
extra-source-files: CHANGELOG.md doctest.sh
45-
tested-with: GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.2, GHC == 8.10.4, GHC == 9.0.1, GHC == 9.2.1
45+
tested-with: GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.2, GHC == 8.10.7, GHC == 9.0.2, GHC == 9.2.4, GHC == 9.4.1
4646

4747
source-repository head
4848
type: git
@@ -65,11 +65,11 @@ library
6565
Generics.SOP.NP
6666
Generics.SOP.NS
6767
Generics.SOP.Sing
68-
build-depends: base >= 4.9 && < 4.17,
68+
build-depends: base >= 4.9 && < 4.18,
6969
sop-core == 0.5.0.*,
70-
template-haskell >= 2.8 && < 2.19,
70+
template-haskell >= 2.8 && < 2.20,
7171
th-abstraction >= 0.4 && < 0.5,
72-
ghc-prim >= 0.3 && < 0.9
72+
ghc-prim >= 0.3 && < 0.10
7373
hs-source-dirs: src
7474
default-language: Haskell2010
7575
ghc-options: -Wall

‎sop-core/sop-core.cabal‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ category: Data
2525
build-type: Simple
2626
cabal-version: >=1.10
2727
extra-source-files: CHANGELOG.md doctest.sh
28-
tested-with: GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.2, GHC == 8.10.4, GHC == 9.0.1, GHC == 9.2.1
28+
tested-with: GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.2, GHC == 8.10.7, GHC == 9.0.2, GHC == 9.2.4, GHC == 9.4.1
2929

3030
source-repository head
3131
type: git
@@ -41,7 +41,7 @@ library
4141
Data.SOP.NP
4242
Data.SOP.NS
4343
Data.SOP.Sing
44-
build-depends: base >= 4.9 && < 4.17,
44+
build-depends: base >= 4.9 && < 4.18,
4545
deepseq >= 1.3 && < 1.5
4646
hs-source-dirs: src
4747
default-language: Haskell2010

0 commit comments

Comments
 (0)