Skip to content

Commit 20e4afe

Browse files
Add GHC 9.2 + 9.4 snapshots
1 parent 4b35116 commit 20e4afe

7 files changed

+45
-7
lines changed

.github/workflows/ci.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,16 @@ jobs:
1313
stack_yaml:
1414
- stack-ghc-8.10.yaml
1515
- stack-ghc-9.0.yaml
16+
# - stack-ghc-9.2.yaml
17+
- stack-ghc-9.4.yaml
1618
- stack-persistent-2.13.yaml
1719
- stack-persistent-2.14.yaml
1820
include:
1921
- stack_yaml: stack.yaml
2022
latest: true
2123

2224
name: build_and_test (${{ matrix.stack_yaml }})
23-
runs-on: ubuntu-latest
25+
runs-on: ubuntu-22.04
2426
services:
2527
postgres:
2628
image: postgres:13.1

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Unreleased
22

3+
* Add GHC 9.4 support
4+
35
# v0.5.0.0
46

57
* Export `SqlQueryT` constructor ([#46](https://github.com/brandonchinn178/persistent-mtl/pull/46))

package.yaml

+10-3
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,28 @@ github: brandonchinn178/persistent-mtl
1919
library:
2020
source-dirs: src
2121
dependencies:
22-
- base >= 4.14 && < 4.16
22+
- base >= 4.14 && < 5
2323
- conduit >= 1.3.4 && < 1.4
2424
- containers >= 0.6 && < 0.7
2525
- exceptions >= 0.10 && < 0.11
2626
- monad-logger >= 0.3 && < 0.4
2727
- mtl >= 2.2.2 && < 2.3
2828
- persistent >= 2.13 && < 2.15
29-
- resource-pool >= 0.2.3.2 && < 0.3
29+
- resource-pool >= 0.2.3.2 && < 0.4
3030
- resourcet >= 1.2.4 && < 1.3
31-
- text >= 1.2.4 && < 1.3
31+
- text >= 1.2.4 && < 2.1
3232
- transformers >= 0.5.6 && < 0.6
3333
- unliftio >= 0.2 && < 0.3
3434
- unliftio-core >= 0.2 && < 0.3
3535
- unliftio-pool >= 0.2 && < 0.3
3636

37+
when:
38+
# https://gitlab.haskell.org/ghc/ghc/-/issues/20836
39+
- condition: >
40+
impl(ghc >= 9.2.0) && impl(ghc < 9.3) ||
41+
impl(ghc >= 9.4.0) && impl(ghc < 9.4.3)
42+
buildable: false
43+
3744
tests:
3845
persistent-mtl-test:
3946
source-dirs: test

persistent-mtl.cabal

+6-3
Original file line numberDiff line numberDiff line change
@@ -44,21 +44,24 @@ library
4444
src
4545
ghc-options: -Wall
4646
build-depends:
47-
base >=4.14 && <4.16
47+
base >=4.14 && <5
4848
, conduit >=1.3.4 && <1.4
4949
, containers ==0.6.*
5050
, exceptions ==0.10.*
5151
, monad-logger ==0.3.*
5252
, mtl >=2.2.2 && <2.3
5353
, persistent >=2.13 && <2.15
54-
, resource-pool >=0.2.3.2 && <0.3
54+
, resource-pool >=0.2.3.2 && <0.4
5555
, resourcet >=1.2.4 && <1.3
56-
, text >=1.2.4 && <1.3
56+
, text >=1.2.4 && <2.1
5757
, transformers >=0.5.6 && <0.6
5858
, unliftio ==0.2.*
5959
, unliftio-core ==0.2.*
6060
, unliftio-pool ==0.2.*
6161
default-language: Haskell2010
62+
if impl(ghc >= 9.2.0) && impl(ghc < 9.3) || impl(ghc >= 9.4.0) && impl(ghc < 9.4.3)
63+
64+
buildable: False
6265

6366
test-suite persistent-mtl-test
6467
type: exitcode-stdio-1.0

stack-ghc-9.2.yaml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
resolver: lts-20.0
2+
3+
extra-deps:
4+
# https://github.com/yesodweb/persistent/issues/1406#issuecomment-1226741099
5+
- persistent-2.13.3.3
6+
7+
flags:
8+
explainable-predicates:
9+
regex: false
10+
11+
ghc-options:
12+
"$locals": -Werror

stack-ghc-9.4.yaml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
resolver: nightly-2022-11-19
2+
3+
extra-deps:
4+
- tasty-autocollect-0.3.2.0
5+
6+
flags:
7+
explainable-predicates:
8+
regex: false
9+
10+
ghc-options:
11+
"$locals": -Werror

test/Example.hs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
{-# LANGUAGE StandaloneDeriving #-}
1010
{-# LANGUAGE TemplateHaskell #-}
1111
{-# LANGUAGE TypeFamilies #-}
12+
{-# LANGUAGE TypeOperators #-}
1213
{-# LANGUAGE UndecidableInstances #-}
1314
{-# OPTIONS_GHC -Wno-missing-methods #-}
1415
{-# OPTIONS_GHC -Wno-unused-top-binds #-}

0 commit comments

Comments
 (0)