Skip to content

Commit

Permalink
Support GHC-9.8
Browse files Browse the repository at this point in the history
  • Loading branch information
@phadej
phadej committed Oct 4, 2023
1 parent 2d0a05e commit 60fb2f7
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 26 deletions.
47 changes: 31 additions & 16 deletions .github/workflows/haskell-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
#
# For more information, see https://github.com/haskell-CI/haskell-ci
#
# version: 0.16.3
# version: 0.17.20231004
#
# REGENDATA ("0.16.3",["github","cabal.project"])
# REGENDATA ("0.17.20231004",["github","cabal.project"])
#
name: Haskell-CI
on:
Expand All @@ -32,19 +32,24 @@ jobs:
strategy:
matrix:
include:
- compiler: ghc-9.6.1
- compiler: ghc-9.8.0.20230929
compilerKind: ghc
compilerVersion: 9.6.1
compilerVersion: 9.8.0.20230929
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.4.4
- compiler: ghc-9.6.3
compilerKind: ghc
compilerVersion: 9.4.4
compilerVersion: 9.6.3
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.2.7
- compiler: ghc-9.4.7
compilerKind: ghc
compilerVersion: 9.2.7
compilerVersion: 9.4.7
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.2.8
compilerKind: ghc
compilerVersion: 9.2.8
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.0.2
Expand Down Expand Up @@ -110,17 +115,19 @@ jobs:
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
if [ "${{ matrix.setup-method }}" = ghcup ]; then
mkdir -p "$HOME/.ghcup/bin"
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
chmod a+x "$HOME/.ghcup/bin/ghcup"
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
else
apt-add-repository -y 'ppa:hvr/ghc'
apt-get update
apt-get install -y "$HCNAME"
mkdir -p "$HOME/.ghcup/bin"
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
chmod a+x "$HOME/.ghcup/bin/ghcup"
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
fi
env:
Expand All @@ -135,10 +142,12 @@ jobs:
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
HCDIR=/opt/$HCKIND/$HCVER
if [ "${{ matrix.setup-method }}" = ghcup ]; then
HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
echo "HC=$HC" >> "$GITHUB_ENV"
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
else
HC=$HCDIR/bin/$HCKIND
Expand Down Expand Up @@ -274,16 +283,22 @@ jobs:
rm -f cabal.project.local
- name: constraint set text-2.0
run: |
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='text ^>=2.0' --dependencies-only -j2 all ; fi
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='text ^>=2.0' all ; fi
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='text ^>=2.0' all ; fi
if [ $((HCNUMVER >= 80000 && HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='text ^>=2.0' all --dry-run ; fi
if [ $((HCNUMVER >= 80000 && HCNUMVER < 90800)) -ne 0 ] ; then cabal-plan topo | sort ; fi
if [ $((HCNUMVER >= 80000 && HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='text ^>=2.0' --dependencies-only -j2 all ; fi
if [ $((HCNUMVER >= 80000 && HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='text ^>=2.0' all ; fi
if [ $((HCNUMVER >= 80000 && HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='text ^>=2.0' all ; fi
- name: constraint set text-1.2
run: |
if [ $((HCNUMVER < 90400)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='text ^>=1.2.3.0' all --dry-run ; fi
if [ $((HCNUMVER < 90400)) -ne 0 ] ; then cabal-plan topo | sort ; fi
if [ $((HCNUMVER < 90400)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='text ^>=1.2.3.0' --dependencies-only -j2 all ; fi
if [ $((HCNUMVER < 90400)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='text ^>=1.2.3.0' all ; fi
if [ $((HCNUMVER < 90400)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='text ^>=1.2.3.0' all ; fi
- name: constraint set lower-bounds-7.4.2
run: |
if [ $((HCNUMVER < 70600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='QuickCheck ==2.14.1' --constraint='array ==0.4.0.0' --constraint='base ==4.5.1.0' --constraint='base-compat ==0.10.5' --constraint='bytestring ==0.9.2.1' --constraint='case-insensitive ==1.2.0.4' --constraint='containers ==0.4.2.1' --constraint='hashable ==1.2.7.0' --constraint='nats ==1.1.2' --constraint='old-time ==1.1.0.0' --constraint='scientific ==0.3.6.2' --constraint='semigroups ==0.18.5' --constraint='tagged ==0.8.6' --constraint='text ==1.2.3.0' --constraint='these ==1.1.1.1' --constraint='time ==1.2.0.1' --constraint='transformers ==0.3.0.0' --constraint='transformers-compat ==0.6.5' --constraint='unordered-containers ==0.2.2.0' --constraint='uuid-types ==1.0.3' --constraint='vector ==0.12.3.1' all --dry-run ; fi
if [ $((HCNUMVER < 70600)) -ne 0 ] ; then cabal-plan topo | sort ; fi
if [ $((HCNUMVER < 70600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='QuickCheck ==2.14.1' --constraint='array ==0.4.0.0' --constraint='base ==4.5.1.0' --constraint='base-compat ==0.10.5' --constraint='bytestring ==0.9.2.1' --constraint='case-insensitive ==1.2.0.4' --constraint='containers ==0.4.2.1' --constraint='hashable ==1.2.7.0' --constraint='nats ==1.1.2' --constraint='old-time ==1.1.0.0' --constraint='scientific ==0.3.6.2' --constraint='semigroups ==0.18.5' --constraint='tagged ==0.8.6' --constraint='text ==1.2.3.0' --constraint='these ==1.1.1.1' --constraint='time ==1.2.0.1' --constraint='transformers ==0.3.0.0' --constraint='transformers-compat ==0.6.5' --constraint='unordered-containers ==0.2.2.0' --constraint='uuid-types ==1.0.3' --constraint='vector ==0.12.3.1' --dependencies-only -j2 all ; fi
if [ $((HCNUMVER < 70600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='QuickCheck ==2.14.1' --constraint='array ==0.4.0.0' --constraint='base ==4.5.1.0' --constraint='base-compat ==0.10.5' --constraint='bytestring ==0.9.2.1' --constraint='case-insensitive ==1.2.0.4' --constraint='containers ==0.4.2.1' --constraint='hashable ==1.2.7.0' --constraint='nats ==1.1.2' --constraint='old-time ==1.1.0.0' --constraint='scientific ==0.3.6.2' --constraint='semigroups ==0.18.5' --constraint='tagged ==0.8.6' --constraint='text ==1.2.3.0' --constraint='these ==1.1.1.1' --constraint='time ==1.2.0.1' --constraint='transformers ==0.3.0.0' --constraint='transformers-compat ==0.6.5' --constraint='unordered-containers ==0.2.2.0' --constraint='uuid-types ==1.0.3' --constraint='vector ==0.12.3.1' all ; fi
- name: save cache
Expand Down
5 changes: 3 additions & 2 deletions cabal.haskell-ci
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
branches: master
head-hackage: False

-- constraint-set QuickCheck-2.13
-- constraints: QuickCheck==2.13.*
Expand Down Expand Up @@ -29,13 +30,13 @@ constraint-set lower-bounds-7.4.2
vector ==0.12.3.1

constraint-set text-1.2
ghc: <9.4
ghc: <9.3
constraints: text ^>=1.2.3.0
tests: True
run-tests: True

constraint-set text-2.0
ghc: >= 8.0
ghc: >= 8.0 && <9.7
constraints: text ^>=2.0
tests: True
run-tests: True
16 changes: 8 additions & 8 deletions quickcheck-instances.cabal
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
name: quickcheck-instances
version: 0.3.29.1
x-revision: 2
version: 0.3.30
synopsis: Common quickcheck instances
description:
QuickCheck instances.
Expand Down Expand Up @@ -39,9 +38,10 @@ tested-with:
|| ==8.8.4
|| ==8.10.7
|| ==9.0.2
|| ==9.2.7
|| ==9.4.4
|| ==9.6.1
|| ==9.2.8
|| ==9.4.7
|| ==9.6.3
|| ==9.8.1

source-repository head
type: git
Expand Down Expand Up @@ -83,13 +83,13 @@ library
other-modules: Test.QuickCheck.Instances.CustomPrelude
hs-source-dirs: src
build-depends:
base >=4.5 && <4.19
base >=4.5 && <4.20
, QuickCheck >=2.14.1 && <2.14.4
, splitmix >=0.0.2 && <0.2

build-depends:
array >=0.4.0.0 && <0.6
, bytestring >=0.9.2.1 && <0.12
, bytestring >=0.9.2.1 && <0.13
, case-insensitive >=1.2.0.4 && <1.3
, containers >=0.4.2.1 && <0.7
, data-fix >=0.3 && <0.4
Expand All @@ -101,7 +101,7 @@ library
, scientific >=0.3.6.2 && <0.4
, strict >=0.4 && <0.6
, tagged >=0.8.6 && <0.9
, text >=1.2.3.0 && <1.3 || >=2.0 && <2.1
, text >=1.2.3.0 && <1.3 || >=2.0 && <2.2
, these >=1.1.1.1 && <1.3
, time-compat >=1.9.4 && <1.10
, transformers >=0.3.0.0 && <0.7
Expand Down

0 comments on commit 60fb2f7

Please sign in to comment.