Skip to content

Commit 67542c7

Browse files
authored
Allow building with ghc 9.2.4 (#38)
1 parent e54e6c1 commit 67542c7

File tree

6 files changed

+23
-25
lines changed

6 files changed

+23
-25
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,30 @@ jobs:
1414
matrix:
1515
os:
1616
- ubuntu-latest
17-
cabal: [3.4]
17+
cabal: [3.6]
1818
ghc:
19-
- 8.8.4
2019
- 8.10.7
2120
- 9.0.2
21+
- 9.2.4
2222
services:
2323
postgres:
24-
image: postgres:12
24+
image: postgres:15
2525
env:
2626
POSTGRES_PASSWORD: postgres
2727
ports:
2828
- 5432:5432
2929
steps:
30-
- uses: actions/checkout@v2
31-
if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/master'
30+
- name: Checkout repository
31+
uses: actions/checkout@v2
3232

33-
- uses: haskell/actions/setup@v1
33+
- name: Setup Haskell Cabal
34+
uses: haskell/actions/setup@v2
3435
id: setup-haskell-cabal
35-
name: Setup Haskell Cabal
3636
with:
3737
ghc-version: ${{ matrix.ghc }}
3838
cabal-version: ${{ matrix.cabal }}
3939

40-
- uses: actions/cache@v2
40+
- uses: actions/cache@v3
4141
name: Cache ~/.cabal/store
4242
with:
4343
path: ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
@@ -55,28 +55,27 @@ jobs:
5555
strategy:
5656
matrix:
5757
stack:
58-
- 2.7.3
58+
- 2.7.5
5959
stack-yaml:
60-
- stack-8.8.4.yaml
6160
- stack-8.10.7.yaml
6261
- stack-9.0.2.yaml
6362
services:
6463
postgres:
65-
image: postgres:12
64+
image: postgres:15
6665
env:
6766
POSTGRES_PASSWORD: postgres
6867
ports:
6968
- 5432:5432
7069
steps:
71-
- uses: actions/checkout@v2
72-
if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/master'
70+
- name: Checkout repository
71+
uses: actions/checkout@v2
7372

74-
- uses: haskell/actions/setup@v1
73+
- uses: haskell/actions/setup@v2
7574
name: Setup Haskell Stack
7675
with:
7776
stack-version: ${{ matrix.stack }}
7877

79-
- uses: actions/cache@v2
78+
- uses: actions/cache@v3
8079
name: Cache ~/.stack
8180
with:
8281
path: ~/.stack

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Build the library with either `cabal new-build` or `stack build`.
7676

7777
* Run DB in a Docker in a separate terminal window using command:
7878
```bash
79-
docker run -p 5432:5432 -e POSTGRES_PASSWORD=postgres postgres:12
79+
docker run -p 5432:5432 -e POSTGRES_PASSWORD=postgres postgres:15
8080
```
8181
* Run tests using `cabal new-test` or `stack test`
8282

postgresql-simple-named.cabal

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ category: Database, PostgreSQL
2828
build-type: Simple
2929
extra-source-files: README.md
3030
, CHANGELOG.md
31-
tested-with: GHC == 8.8.4
32-
, GHC == 8.10.7
31+
tested-with: GHC == 8.10.7
3332
, GHC == 9.0.2
33+
, GHC == 9.2.4
3434

3535
source-repository head
3636
type: git
3737
location: https://github.com/Holmusk/postgresql-simple-named.git
3838

3939
common common-options
40-
build-depends: base >= 4.11 && < 4.16
40+
build-depends: base >= 4.11 && < 4.17
4141

4242
ghc-options: -Wall
4343
-Wincomplete-uni-patterns
@@ -72,10 +72,10 @@ library
7272
import: common-options
7373
hs-source-dirs: src
7474
exposed-modules: PgNamed
75-
build-depends: bytestring ^>= 0.10.8
76-
, mtl ^>= 2.2
75+
build-depends: bytestring >= 0.10 && < 0.12
76+
, mtl >= 2.2 && < 2.4
7777
, postgresql-simple >= 0.5 && < 0.7
78-
, text ^>= 1.2
78+
, text >= 1.2 && < 2.1
7979

8080
test-suite postgresql-simple-named-test
8181
import: common-options

stack-8.10.7.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
resolver: lts-18.14
1+
resolver: lts-18.28

stack-8.8.4.yaml

Lines changed: 0 additions & 1 deletion
This file was deleted.

stack-9.0.2.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
resolver: lts-19.0
1+
resolver: lts-19.30

0 commit comments

Comments
 (0)