Skip to content

Commit

Permalink
Add GHC 9.2 + 9.4 snapshots
Browse files Browse the repository at this point in the history
  • Loading branch information
brandonchinn178 committed Nov 20, 2022
1 parent 4b35116 commit 6890577
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 7 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,16 @@ jobs:
stack_yaml:
- stack-ghc-8.10.yaml
- stack-ghc-9.0.yaml
# - stack-ghc-9.2.yaml
- stack-ghc-9.4.yaml
- stack-persistent-2.13.yaml
- stack-persistent-2.14.yaml
include:
- stack_yaml: stack.yaml
latest: true

name: build_and_test (${{ matrix.stack_yaml }})
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
services:
postgres:
image: postgres:13.1
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Unreleased

* Add GHC 9.4 support

# v0.5.0.0

* Export `SqlQueryT` constructor ([#46](https://github.com/brandonchinn178/persistent-mtl/pull/46))
Expand Down
13 changes: 10 additions & 3 deletions package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,28 @@ github: brandonchinn178/persistent-mtl
library:
source-dirs: src
dependencies:
- base >= 4.14 && < 4.16
- base >= 4.14 && < 5
- conduit >= 1.3.4 && < 1.4
- containers >= 0.6 && < 0.7
- exceptions >= 0.10 && < 0.11
- monad-logger >= 0.3 && < 0.4
- mtl >= 2.2.2 && < 2.3
- persistent >= 2.13 && < 2.15
- resource-pool >= 0.2.3.2 && < 0.3
- resource-pool >= 0.2.3.2 && < 0.4
- resourcet >= 1.2.4 && < 1.3
- text >= 1.2.4 && < 1.3
- text >= 1.2.4 && < 2.1
- transformers >= 0.5.6 && < 0.6
- unliftio >= 0.2 && < 0.3
- unliftio-core >= 0.2 && < 0.3
- unliftio-pool >= 0.2 && < 0.3

when:
# https://gitlab.haskell.org/ghc/ghc/-/issues/20836
- condition: >
impl(ghc >= 9.2.0) && impl(ghc < 9.3) ||
impl(ghc >= 9.4.0) && impl(ghc < 9.4.3)
buildable: false
tests:
persistent-mtl-test:
source-dirs: test
Expand Down
9 changes: 6 additions & 3 deletions persistent-mtl.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -44,21 +44,24 @@ library
src
ghc-options: -Wall
build-depends:
base >=4.14 && <4.16
base >=4.14 && <5
, conduit >=1.3.4 && <1.4
, containers ==0.6.*
, exceptions ==0.10.*
, monad-logger ==0.3.*
, mtl >=2.2.2 && <2.3
, persistent >=2.13 && <2.15
, resource-pool >=0.2.3.2 && <0.3
, resource-pool >=0.2.3.2 && <0.4
, resourcet >=1.2.4 && <1.3
, text >=1.2.4 && <1.3
, text >=1.2.4 && <2.1
, transformers >=0.5.6 && <0.6
, unliftio ==0.2.*
, unliftio-core ==0.2.*
, unliftio-pool ==0.2.*
default-language: Haskell2010
if impl(ghc >= 9.2.0) && impl(ghc < 9.3) || impl(ghc >= 9.4.0) && impl(ghc < 9.4.3)

buildable: False

test-suite persistent-mtl-test
type: exitcode-stdio-1.0
Expand Down
12 changes: 12 additions & 0 deletions stack-ghc-9.2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
resolver: lts-20.0

extra-deps:
# https://github.com/yesodweb/persistent/issues/1406#issuecomment-1226741099
- persistent-2.13.3.3

flags:
explainable-predicates:
regex: false

ghc-options:
"$locals": -Werror
13 changes: 13 additions & 0 deletions stack-ghc-9.4.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
resolver: nightly-2022-11-19

extra-deps:
# tasty-autocollect-0.3.2.0
- github: brandonchinn178/tasty-autocollect
commit: d48d8ecb4215aae115dce9407989592caa5f47a0

flags:
explainable-predicates:
regex: false

ghc-options:
"$locals": -Werror
1 change: 1 addition & 0 deletions test/Example.hs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
{-# LANGUAGE StandaloneDeriving #-}
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE TypeOperators #-}
{-# LANGUAGE UndecidableInstances #-}
{-# OPTIONS_GHC -Wno-missing-methods #-}
{-# OPTIONS_GHC -Wno-unused-top-binds #-}
Expand Down

0 comments on commit 6890577

Please sign in to comment.