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

Update for GHC 9.8 #547

Merged
merged 2 commits into from
Oct 15, 2023
Merged

Update for GHC 9.8 #547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
793ce2c
Update for GHC 9.8
amesgen Oct 13, 2023
a6224fe
CI: use GHC 9.8.1 and 9.6.3
amesgen Oct 13, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ jobs:
strategy:
matrix:
cabal: ["3.10"]
ghc: ["9.2.8", "9.4.7", "9.6.2"]
ghc: ["9.2.8", "9.4.7", "9.6.3", "9.8.1"]
env:
CONFIG: "--enable-tests --enable-benchmarks --flags=dev"
steps:
- uses: actions/checkout@v4
- uses: haskell/actions/setup@v2
- uses: haskell-actions/setup@v2
id: setup-haskell-cabal
with:
ghc-version: ${{ matrix.ghc }}
Expand Down
19 changes: 11 additions & 8 deletions megaparsec-tests/megaparsec-tests.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ license: BSD-2-Clause
license-file: LICENSE.md
maintainer: Mark Karpov <[email protected]>
author: Megaparsec contributors
tested-with: ghc ==9.2.7 ghc ==9.4.4 ghc ==9.6.1
tested-with: ghc ==9.2.8 ghc ==9.4.7 ghc ==9.6.3 ghc ==9.8.1
homepage: https://github.com/mrkkrp/megaparsec
bug-reports: https://github.com/mrkkrp/megaparsec/issues
synopsis: Test utilities and the test suite of Megaparsec
Expand All @@ -26,10 +26,10 @@ library
build-depends:
QuickCheck >=2.10 && <2.15,
base >=4.15 && <5,
bytestring >=0.2 && <0.12,
containers >=0.5 && <0.7,
hspec >=2.0 && <3,
hspec-megaparsec >=2.0 && <3,
bytestring >=0.2 && <0.13,
containers >=0.5 && <0.8,
hspec >=2.0 && <3.0,
hspec-megaparsec >=2.0 && <3.0,
megaparsec ==9.5.0,
mtl >=2.2.2 && <3,
text >=0.2 && <2.2,
Expand Down Expand Up @@ -64,11 +64,11 @@ test-suite tests
build-depends:
QuickCheck >=2.10 && <2.15,
base >=4.15 && <5,
bytestring >=0.2 && <0.12,
bytestring >=0.2 && <0.13,
case-insensitive >=1.2 && <1.3,
containers >=0.5 && <0.7,
containers >=0.5 && <0.8,
hspec >=2.0 && <3,
hspec-megaparsec >=2.0 && <3,
hspec-megaparsec >=2.0 && <3.0,
megaparsec ==9.5.0,
megaparsec-tests,
mtl >=2.2.2 && <3,
Expand All @@ -84,3 +84,6 @@ test-suite tests

else
ghc-options: -O2 -Wall

if impl(ghc >=9.8)
mrkkrp marked this conversation as resolved.
Show resolved Hide resolved
ghc-options: -Wno-x-partial
22 changes: 12 additions & 10 deletions megaparsec.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ author:
Paolo Martini <[email protected]>,
Daan Leijen <[email protected]>

tested-with: ghc ==9.2.8 ghc ==9.4.7 ghc ==9.6.2
tested-with: ghc ==9.2.8 ghc ==9.4.7 ghc ==9.6.3 ghc ==9.8.1
homepage: https://github.com/mrkkrp/megaparsec
bug-reports: https://github.com/mrkkrp/megaparsec/issues
synopsis: Monadic parser combinators
Expand Down Expand Up @@ -57,9 +57,9 @@ library
default-language: Haskell2010
build-depends:
base >=4.15 && <5,
bytestring >=0.2 && <0.12,
bytestring >=0.2 && <0.13,
case-insensitive >=1.2 && <1.3,
containers >=0.5 && <0.7,
containers >=0.5 && <0.8,
deepseq >=1.3 && <1.6,
mtl >=2.2.2 && <3,
parser-combinators >=1.0 && <2,
Expand All @@ -68,13 +68,15 @@ library
transformers >=0.4 && <0.7

if flag(dev)
ghc-options: -Wall -Werror -Wpartial-fields -Wunused-packages
ghc-options:
-Wall -Werror -Wredundant-constraints -Wpartial-fields
mrkkrp marked this conversation as resolved.
Show resolved Hide resolved
-Wunused-packages

else
ghc-options: -O2 -Wall

if (flag(dev) && !impl(ghc ==9.6.2))
ghc-options: -Wredundant-constraints
if impl(ghc >=9.8)
ghc-options: -Wno-x-partial

benchmark bench-speed
type: exitcode-stdio-1.0
Expand All @@ -83,8 +85,8 @@ benchmark bench-speed
default-language: Haskell2010
build-depends:
base >=4.15 && <5,
bytestring >=0.2 && <0.12,
containers >=0.5 && <0.7,
bytestring >=0.2 && <0.13,
containers >=0.5 && <0.8,
criterion >=0.6.2.1 && <1.7,
deepseq >=1.3 && <1.6,
megaparsec,
Expand All @@ -105,8 +107,8 @@ benchmark bench-memory
default-language: Haskell2010
build-depends:
base >=4.15 && <5,
bytestring >=0.2 && <0.12,
containers >=0.5 && <0.7,
bytestring >=0.2 && <0.13,
containers >=0.5 && <0.8,
deepseq >=1.3 && <1.6,
megaparsec,
text >=0.2 && <2.2,
Expand Down