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

Jump to bottom

Support GHC 9.10 #82

Merged
merged 5 commits into from
Jun 26, 2024
Merged

Support GHC 9.10 #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
90968b1
v1.0.9-r4: use major-major upper bounds only
andreasabel Apr 27, 2024
9fc827a
Revert major bound Cabal <3.14 in main lib
ulidtko Jun 14, 2024
6a1eee3
docs: drop Cabal setup-depends from examples
ulidtko Jun 14, 2024
b66f814
Bump CI to GHC 9.10.1
ulidtko Jun 14, 2024
daeb83d
fix(CI): Relax .installed constraints on Cabal & Cabal-syntax
ulidtko Jun 14, 2024
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
1 change: 1 addition & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.github/workflows/haskell-ci.yml linguist-generated=true
38 changes: 21 additions & 17 deletions .github/workflows/haskell-ci.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 7 additions & 5 deletions cabal-doctest.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: cabal-doctest
version: 1.0.9
x-revision: 3
x-revision: 4
synopsis: A Setup.hs helper for running doctests
description:
As of now (end of 2021), there isn't @cabal doctest@
Expand All @@ -21,9 +21,10 @@ extra-source-files:
README.md

tested-with:
GHC == 9.8.1
GHC == 9.6.3
GHC == 9.4.7
GHC == 9.10.1
GHC == 9.8.2
GHC == 9.6.5
GHC == 9.4.8
GHC == 9.2.8
GHC == 9.0.2
GHC == 8.10.7
Expand All @@ -49,8 +50,9 @@ library
other-modules:
other-extensions:
build-depends:
-- upper-bounds are major-major only, unless there is evidence for build failures
base >=4.3 && <5
, Cabal >=1.10 && <3.12
, Cabal >=1.10 && <3.14
, directory
, filepath

Expand Down
8 changes: 7 additions & 1 deletion cabal.haskell-ci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,10 @@ branches: master
-- jobs-selection: any

-- Older haddocks error out for various reasons
haddock: >= 9.4
haddock: >= 9.4

-- Not pinned: the version decision is on haskell-ci
-- cabal-install-version: 3.10.3.0

-- Workaround for https://github.com/haskell/cabal/issues/9917
installed: +all -Cabal -Cabal-syntax
14 changes: 7 additions & 7 deletions multiple-components-example/multiple-components-example.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ category: Example
build-type: Custom

tested-with:
GHC == 9.8.1
GHC == 9.6.3
GHC == 9.4.7
GHC == 9.10.1
GHC == 9.8.2
GHC == 9.6.5
GHC == 9.4.8
GHC == 9.2.8
GHC == 9.0.2
GHC == 8.10.7
Expand All @@ -38,7 +39,6 @@ tested-with:
custom-setup
setup-depends:
base < 5
, Cabal < 4
, cabal-doctest >=1.0.9 && <1.1

library
Expand Down Expand Up @@ -69,10 +69,10 @@ test-suite doctests
main-is: doctests.hs
build-depends:
base
, base-compat >=0.10.5 && <0.13
, doctest >=0.15 && <0.23
, base-compat >=0.10.5 && <1
, doctest >=0.15 && <1
, multiple-components-example
, QuickCheck >=2.12 && <2.15
, QuickCheck >=2.12 && <3
, template-haskell

ghc-options: -Wall -threaded
Expand Down
14 changes: 7 additions & 7 deletions simple-example/simple-example.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ build-type: Custom
cabal-version: 1.12

tested-with:
GHC == 9.8.1
GHC == 9.6.3
GHC == 9.4.7
GHC == 9.10.1
GHC == 9.8.2
GHC == 9.6.5
GHC == 9.4.8
GHC == 9.2.8
GHC == 9.0.2
GHC == 8.10.7
Expand All @@ -37,7 +38,6 @@ tested-with:
custom-setup
setup-depends:
base < 5
, Cabal < 4
, cabal-doctest >=1.0.9 && <1.1

library
Expand All @@ -55,9 +55,9 @@ test-suite doctests
main-is: doctests.hs
build-depends:
base
, base-compat >=0.10.5 && <0.13
, doctest >=0.15 && <0.23
, QuickCheck >=2.12 && <2.15
, base-compat >=0.10.5 && <1
, doctest >=0.15 && <1
, QuickCheck >=2.12 && <3
, simple-example
, template-haskell

Expand Down