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

Add GHC-9.10.1 to CI, allow containers-0.7 #508

Merged
merged 1 commit into from
May 13, 2024
Merged

Add GHC-9.10.1 to CI, allow containers-0.7 #508

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
21 changes: 15 additions & 6 deletions .github/workflows/haskell-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ jobs:
compilerVersion: "8.4"
setup-method: hvr-ppa
allow-failure: false
- compiler: ghc-9.10.1
compilerKind: ghc
compilerVersion: 9.10.1
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.8.2
compilerKind: ghc
compilerVersion: 9.8.2
Expand Down Expand Up @@ -237,7 +242,7 @@ jobs:
echo "packages: $GITHUB_WORKSPACE/source/optics-th" >> cabal.project
echo "packages: $GITHUB_WORKSPACE/source/optics-vl" >> cabal.project
echo "packages: $GITHUB_WORKSPACE/source/indexed-profunctors" >> cabal.project
echo "packages: $GITHUB_WORKSPACE/source/template-haskell-optics" >> cabal.project
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER < 91000)) -ne 0 ] ; then echo "packages: $GITHUB_WORKSPACE/source/template-haskell-optics" >> cabal.project ; fi
echo "packages: $GITHUB_WORKSPACE/source/metametapost" >> cabal.project
cat cabal.project
- name: sdist
Expand Down Expand Up @@ -278,7 +283,7 @@ jobs:
echo "packages: ${PKGDIR_optics_th}" >> cabal.project
echo "packages: ${PKGDIR_optics_vl}" >> cabal.project
echo "packages: ${PKGDIR_indexed_profunctors}" >> cabal.project
echo "packages: ${PKGDIR_template_haskell_optics}" >> cabal.project
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER < 91000)) -ne 0 ] ; then echo "packages: ${PKGDIR_template_haskell_optics}" >> cabal.project ; fi
echo "packages: ${PKGDIR_metametapost}" >> cabal.project
echo "package optics" >> cabal.project
echo " ghc-options: -Werror=missing-methods" >> cabal.project
Expand All @@ -294,11 +299,15 @@ jobs:
echo " ghc-options: -Werror=missing-methods" >> cabal.project
echo "package indexed-profunctors" >> cabal.project
echo " ghc-options: -Werror=missing-methods" >> cabal.project
echo "package template-haskell-optics" >> cabal.project
echo " ghc-options: -Werror=missing-methods" >> cabal.project
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER < 91000)) -ne 0 ] ; then echo "package template-haskell-optics" >> cabal.project ; fi
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER < 91000)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
echo "package metametapost" >> cabal.project
echo " ghc-options: -Werror=missing-methods" >> cabal.project
cat >> cabal.project <<EOF
allow-newer: indexed-traversable:base
allow-newer: indexed-traversable:containers
allow-newer: indexed-traversable-instances:base
allow-newer: unordered-containers:template-haskell
EOF
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(indexed-profunctors|metametapost|optics|optics-core|optics-extra|optics-sop|optics-th|optics-vl|template-haskell-optics)$/; }' >> cabal.project.local
cat cabal.project
Expand Down Expand Up @@ -360,8 +369,8 @@ jobs:
${CABAL} -vnormal check
cd ${PKGDIR_indexed_profunctors} || false
${CABAL} -vnormal check
cd ${PKGDIR_template_haskell_optics} || false
${CABAL} -vnormal check
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER < 91000)) -ne 0 ] ; then cd ${PKGDIR_template_haskell_optics} || false ; fi
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER < 91000)) -ne 0 ] ; then ${CABAL} -vnormal check ; fi
cd ${PKGDIR_metametapost} || false
${CABAL} -vnormal check
- name: haddock
Expand Down
7 changes: 7 additions & 0 deletions cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,10 @@ packages:
metametapost/*.cabal

tests: true

-- TODO for GHC-9.10.1
allow-newer: indexed-traversable:base
allow-newer: indexed-traversable:containers
allow-newer: indexed-traversable-instances:base
-- https://github.com/haskell-unordered-containers/unordered-containers/issues/489
allow-newer: unordered-containers:template-haskell
4 changes: 3 additions & 1 deletion indexed-profunctors/indexed-profunctors.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ build-type: Simple
maintainer: optics@well-typed.com
author: Adam Gundry, Andres Löh, Andrzej Rybczak, Oleg Grenrus
tested-with: GHC ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.7
|| ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.5 || ==9.8.2, GHCJS ==8.4
|| ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.5 || ==9.8.2
|| ==9.10.1,
GHCJS ==8.4
synopsis: Utilities for indexed profunctors
category: Data, Optics, Lenses, Profunctors
description:
Expand Down
4 changes: 3 additions & 1 deletion metametapost/metametapost.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ license: BSD-3-Clause
license-file: LICENSE
build-type: Simple
tested-with: GHC ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.7
|| ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.5 || ==9.8.2, GHCJS ==8.4
|| ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.5 || ==9.8.2
|| ==9.10.1,
GHCJS ==8.4
maintainer: oleg@well-typed.com
synopsis: Generate optics documentation diagrams
category: Optics, Examples
Expand Down
6 changes: 4 additions & 2 deletions optics-core/optics-core.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ build-type: Simple
maintainer: optics@well-typed.com
author: Adam Gundry, Andres Löh, Andrzej Rybczak, Oleg Grenrus
tested-with: GHC ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.7
|| ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.5 || ==9.8.2, GHCJS ==8.4
|| ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.5 || ==9.8.2
|| ==9.10.1,
GHCJS ==8.4
synopsis: Optics as an abstract interface: core definitions
category: Data, Optics, Lenses
description:
Expand Down Expand Up @@ -73,7 +75,7 @@ library

build-depends: base >= 4.10 && <5
, array >= 0.5.2.0 && <0.6
, containers >= 0.5.10.2 && <0.7
, containers >= 0.5.10.2 && <0.8
, indexed-profunctors >= 0.1 && <0.2
, transformers >= 0.5 && <0.7
, indexed-traversable >= 0.1 && <0.2
Expand Down
6 changes: 4 additions & 2 deletions optics-extra/optics-extra.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ build-type: Simple
maintainer: optics@well-typed.com
author: Andrzej Rybczak
tested-with: GHC ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.7
|| ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.5 || ==9.8.2, GHCJS ==8.4
|| ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.5 || ==9.8.2
|| ==9.10.1,
GHCJS ==8.4
synopsis: Extra utilities and instances for optics-core
category: Data, Optics, Lenses
description:
Expand Down Expand Up @@ -64,7 +66,7 @@ library
build-depends: base >= 4.10 && <5
, array >= 0.5.2.0 && <0.6
, bytestring >= 0.10.8 && <0.13
, containers >= 0.5.10.2 && <0.7
, containers >= 0.5.10.2 && <0.8
, hashable >= 1.1.1 && <1.5
, indexed-profunctors >= 0.1 && <0.2
, mtl >= 2.2.2 && <2.4
Expand Down
4 changes: 3 additions & 1 deletion optics-sop/optics-sop.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ build-type: Simple
maintainer: optics@well-typed.com
author: Adam Gundry, Andres Löh, Andrzej Rybczak
tested-with: GHC ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.7
|| ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.5 || ==9.8.2, GHCJS ==8.4
|| ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.5 || ==9.8.2
|| ==9.10.1,
GHCJS ==8.4
synopsis: Optics for generics-sop, and using generics-sop
category: Data, Optics, Lenses, Generics
description:
Expand Down
8 changes: 5 additions & 3 deletions optics-th/optics-th.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ build-type: Simple
maintainer: optics@well-typed.com
author: Andrzej Rybczak
tested-with: GHC ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.7
|| ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.5 || ==9.8.2, GHCJS ==8.4
|| ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.5 || ==9.8.2
|| ==9.10.1,
GHCJS ==8.4
synopsis: Optics construction using TemplateHaskell
category: Data, Optics, Lenses
description:
Expand Down Expand Up @@ -61,10 +63,10 @@ library
hs-source-dirs: src

build-depends: base >= 4.10 && <5
, containers >= 0.5.10.2 && <0.7
, containers >= 0.5.10.2 && <0.8
, mtl >= 2.2.2 && <2.4
, optics-core >= 0.4.1 && <0.5
, template-haskell >= 2.12 && <2.22
, template-haskell >= 2.12 && <2.23
, th-abstraction >= 0.4 && <0.8
, transformers >= 0.5 && <0.7

Expand Down
4 changes: 3 additions & 1 deletion optics-vl/optics-vl.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ build-type: Simple
maintainer: optics@well-typed.com
author: Andrzej Rybczak
tested-with: GHC ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.7
|| ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.5 || ==9.8.2, GHCJS ==8.4
|| ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.5 || ==9.8.2
|| ==9.10.1,
GHCJS ==8.4
synopsis: Utilities for compatibility with van Laarhoven optics
category: Data, Optics, Lenses
description:
Expand Down
6 changes: 4 additions & 2 deletions optics/optics.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ build-type: Simple
maintainer: optics@well-typed.com
author: Adam Gundry, Andres Löh, Andrzej Rybczak, Oleg Grenrus
tested-with: GHC ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.7
|| ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.5 || ==9.8.2, GHCJS ==8.4
|| ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.5 || ==9.8.2
|| ==9.10.1,
GHCJS ==8.4
synopsis: Optics as an abstract interface
category: Data, Optics, Lenses
description:
Expand Down Expand Up @@ -67,7 +69,7 @@ library

build-depends: base >= 4.10 && <5
, array >= 0.5.2.0 && <0.6
, containers >= 0.5.10.2 && <0.7
, containers >= 0.5.10.2 && <0.8
, mtl >= 2.2.2 && <2.4
, optics-core >= 0.4.1 && <0.4.2
, optics-extra >= 0.4.2 && <0.4.3
Expand Down
4 changes: 2 additions & 2 deletions template-haskell-optics/template-haskell-optics.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ library

build-depends: base >= 4.10 && <5
, optics-core >= 0.4 && <0.5
, containers >= 0.5.10.2 && <0.7
, template-haskell >= 2.12 && <2.23
, containers >= 0.5.10.2 && <0.8
, template-haskell >= 2.12 && <2.22
, th-abstraction >= 0.4 && <0.8

exposed-modules: Language.Haskell.TH.Optics
Loading