Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support GHC-9.8 #109

Merged
merged 1 commit into from
Oct 24, 2023
Merged

Support GHC-9.8 #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 40 additions & 19 deletions .github/workflows/haskell-ci.yml
View file
Open in desktop
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.15.20230313
# version: 0.17.20231010
#
# REGENDATA ("0.15.20230313",["github","--config=cabal.haskell-ci","cabal.project"])
# REGENDATA ("0.17.20231010",["github","--config=cabal.haskell-ci","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.1
compilerKind: ghc
compilerVersion: 9.6.1
compilerVersion: 9.8.1
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 @@ -100,7 +105,7 @@ 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.18.0/x86_64-linux-ghcup-0.1.18.0 > "$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" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
Expand All @@ -109,7 +114,7 @@ jobs:
apt-get update
apt-get install -y "$HCNAME"
mkdir -p "$HOME/.ghcup/bin"
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$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" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
fi
Expand All @@ -125,10 +130,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 @@ -187,22 +194,22 @@ jobs:
- name: cache (tools)
uses: actions/cache/restore@v3
with:
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-e3e6fd3b
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-1504b45f
path: ~/.haskell-ci-tools
- name: install cabal-plan
run: |
mkdir -p $HOME/.cabal/bin
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
echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c -
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
echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c -
xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
rm -f cabal-plan.xz
chmod a+x $HOME/.cabal/bin/cabal-plan
cabal-plan --version
- name: install cabal-docspec
run: |
mkdir -p $HOME/.cabal/bin
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
echo 'e224700d9e8c9ec7ec6bc3f542ba433cd9925a5d356676c62a9bd1f2c8be8f8a cabal-docspec.xz' | sha256sum -c -
curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20230517/cabal-docspec-0.0.0.20230517-x86_64-linux.xz > cabal-docspec.xz
echo '3b31bbe463ad4d671abbc103db49628562ec48a6604cab278207b5b6acd21ed7 cabal-docspec.xz' | sha256sum -c -
xz -d < cabal-docspec.xz > $HOME/.cabal/bin/cabal-docspec
rm -f cabal-docspec.xz
chmod a+x $HOME/.cabal/bin/cabal-docspec
Expand All @@ -215,7 +222,7 @@ jobs:
uses: actions/cache/save@v3
if: always()
with:
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-e3e6fd3b
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-1504b45f
path: ~/.haskell-ci-tools
- name: checkout
uses: actions/checkout@v3
Expand Down Expand Up @@ -379,30 +386,44 @@ jobs:
rm -f cabal.project.local
- name: constraint set mini
run: |
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='vec -adjunctions' --constraint='vec -distributive' --constraint='vec -semigroupoids' --constraint='ral -adjunctions' --constraint='ral -distributive' --constraint='ral -semigroupoids' all --dry-run
cabal-plan topo | sort
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='vec -adjunctions' --constraint='vec -distributive' --constraint='vec -semigroupoids' --constraint='ral -adjunctions' --constraint='ral -distributive' --constraint='ral -semigroupoids' --dependencies-only -j2 all
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='vec -adjunctions' --constraint='vec -distributive' --constraint='vec -semigroupoids' --constraint='ral -adjunctions' --constraint='ral -distributive' --constraint='ral -semigroupoids' all
- name: constraint set ral-no-adjunctions
run: |
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='ral -adjunctions' all --dry-run
cabal-plan topo | sort
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='ral -adjunctions' --dependencies-only -j2 all
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='ral -adjunctions' all
- name: constraint set ral-no-semigroupoids
run: |
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='ral -semigroupoids' all --dry-run
cabal-plan topo | sort
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='ral -semigroupoids' --dependencies-only -j2 all
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='ral -semigroupoids' all
- name: constraint set ral-no-distributive
run: |
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='ral -distributive' all --dry-run
cabal-plan topo | sort
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='ral -distributive' --dependencies-only -j2 all
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='ral -distributive' all
- name: constraint set vec-no-adjunctions
run: |
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='vec -adjunctions' all --dry-run
cabal-plan topo | sort
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='vec -adjunctions' --dependencies-only -j2 all
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='vec -adjunctions' all
- name: constraint set vec-no-semigroupoids
run: |
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='vec -semigroupoids' all --dry-run
cabal-plan topo | sort
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='vec -semigroupoids' --dependencies-only -j2 all
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='vec -semigroupoids' all
- name: constraint set vec-no-distributive
run: |
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='vec -distributive' all --dry-run
cabal-plan topo | sort
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='vec -distributive' --dependencies-only -j2 all
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='vec -distributive' all
- name: save cache
Expand Down
12 changes: 7 additions & 5 deletions bin/bin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
cabal-version: 2.2
name: bin
version: 0.1.3
x-revision: 1
synopsis: Bin: binary natural numbers.
category: Data, Dependent Types, Singletons, Math
description:
Expand Down Expand Up @@ -43,9 +44,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 All @@ -67,10 +69,10 @@ library

other-modules: TrustworthyCompat
build-depends:
, base >=4.7 && <4.19
, base >=4.7 && <4.20
, boring ^>=0.2
, dec ^>=0.0.3
, deepseq >=1.3.0.2 && <1.5
, deepseq >=1.3.0.2 && <1.6
, fin ^>=0.3
, hashable >=1.2.7.0 && <1.5
, QuickCheck ^>=2.14.2
Expand Down
13 changes: 7 additions & 6 deletions fin/fin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cabal-version: >=1.10
name: fin
version: 0.3
x-revision: 1
x-revision: 2
synopsis: Nat and Fin: peano naturals and finite numbers
category: Data, Dependent Types, Singletons, Math
description:
Expand Down Expand Up @@ -66,9 +66,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 All @@ -89,10 +90,10 @@ library

other-modules: TrustworthyCompat
build-depends:
base >=4.7 && <4.19
base >=4.7 && <4.20
, boring >=0.2 && <0.3
, dec >=0.0.4 && <0.1
, deepseq >=1.3.0.2 && <1.5
, deepseq >=1.3.0.2 && <1.6
, hashable >=1.2.7.0 && <1.5
, QuickCheck >=2.13.2 && <2.15
, some >=1.0.4 && <1.1
Expand Down
11 changes: 6 additions & 5 deletions ral-lens/ral-lens.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cabal-version: 2.2
name: ral-lens
version: 0.2
x-revision: 3
x-revision: 4
synopsis: Length-indexed random access lists: lens utilities.
category: Data, Dependent Types, Singletons, Lens
description:
Expand All @@ -27,9 +27,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 All @@ -49,7 +50,7 @@ library
Data.RAVec.Tree.Lens

build-depends:
, base >=4.7 && <4.19
, base >=4.7 && <4.20
, bin ^>=0.1
, fin ^>=0.2 || ^>=0.3
, lens >=4.16 && <5.3
Expand Down
11 changes: 6 additions & 5 deletions ral-optics/ral-optics.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cabal-version: 2.2
name: ral-optics
version: 0.2
x-revision: 3
x-revision: 4
synopsis: Length-indexed random access lists: optics utilities.
category: Data, Dependent Types, Singletons, Optics
description:
Expand All @@ -25,9 +25,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 All @@ -51,7 +52,7 @@ library
Data.RAVec.NonEmpty.Optics.Internal

build-depends:
, base >=4.9 && <4.19
, base >=4.9 && <4.20
, bin ^>=0.1
, fin ^>=0.2 || ^>=0.3
, optics-core >=0.2 && <0.5
Expand Down
14 changes: 7 additions & 7 deletions ral/ral.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cabal-version: 2.2
name: ral
version: 0.2.1
x-revision: 2
x-revision: 3
synopsis: Random access lists
category: Data, Dependent Types, Singletons
description:
Expand Down Expand Up @@ -39,10 +39,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 @@ -89,8 +89,8 @@ library

-- GHC boot libs
build-depends:
, base >=4.7 && <4.19
, deepseq >=1.3.0.1 && <1.5
, base >=4.7 && <4.20
, deepseq >=1.3.0.1 && <1.6

if !impl(ghc >=8.0)
build-depends: semigroups >=0.18.5 && <0.21
Expand Down
9 changes: 5 additions & 4 deletions tests/tests.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,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 All @@ -51,7 +52,7 @@ library
build-depends:
, containers
, math-functions
, tasty ^>=1.4
, tasty ^>=1.4 || ^>=1.5
, tasty-quickcheck ^>=0.10.1

if !impl(ghc >=7.10)
Expand Down
11 changes: 6 additions & 5 deletions vec-lens/vec-lens.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cabal-version: 2.2
name: vec-lens
version: 0.4
x-revision: 3
x-revision: 4
synopsis: Vec: length-indexed (sized) list: lens support
category: Data, Dependent Types, Lens
description:
Expand Down Expand Up @@ -30,9 +30,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 All @@ -51,7 +52,7 @@ library
Data.Vec.Pull.Lens

-- GHC boot libs
build-depends: base >=4.7 && <4.19
build-depends: base >=4.7 && <4.20

-- siblings
build-depends:
Expand Down
Loading