Skip to content

Commit 34f27e5

Browse files
authored
Merge pull request #53 from obsidiansystems/ghc-9.12
Support GHC 9.12
2 parents d85619e + e5728bb commit 34f27e5

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@ jobs:
66
build:
77
runs-on: ${{ matrix.os }}
88
strategy:
9+
fail-fast: false
910
matrix:
10-
ghc: ['8.6.5', '8.8.4', '8.10.7', '9.0.2', '9.8.2', '9.10.1']
11+
ghc: ['8.6', '8.8', '8.10', '9.0', '9.2', '9.4', '9.6', '9.8', '9.10', '9.12']
1112
os: ['ubuntu-latest'] # Disabled macos until https://github.com/haskellari/postgresql-libpq/issues/71 is figured out
1213
name: Haskell GHC ${{ matrix.ghc }} on ${{ matrix.os }}
1314
steps:
14-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@v4
1516
- name: Setup Haskell
16-
uses: haskell/actions/setup@v2
17+
uses: haskell-actions/setup@v2
1718
with:
1819
ghc-version: ${{ matrix.ghc }}
1920
cabal-version: ${{ matrix.cabal }}

gargoyle-postgresql-connect/gargoyle-postgresql-connect.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ synopsis: Connect to gargoyle-managed postgresql instances
1111
extra-source-files: ChangeLog.md
1212
category: System
1313
description: A convenience utility for connecting to a postgresql instance managed by gargoyle.
14-
tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.8.2 || ==9.10.1
14+
tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.8.2 || ==9.10.1 || ==9.12.2
1515

1616
library
1717
exposed-modules: Gargoyle.PostgreSQL.Connect
1818
ghc-options: -Wall
1919
ghc-prof-options: -fprof-auto-exported
2020
build-depends:
21-
base >=4.12 && <4.21
21+
base >=4.12 && <4.22
2222
, bytestring >=0.10 && <0.13
2323
, directory >=1.3 && <1.4
2424
, gargoyle >=0.1.1.0 && < 0.2

gargoyle-postgresql-nix/gargoyle-postgresql-nix.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ extra-source-files:
1616
README.md
1717
ChangeLog.md
1818

19-
tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.8.2 || ==9.10.1
19+
tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.8.2 || ==9.10.1 || ==9.12.2
2020

2121
library
2222
exposed-modules: Gargoyle.PostgreSQL.Nix
2323
other-modules: Paths_gargoyle_postgresql_nix
2424
ghc-options: -Wall
2525
ghc-prof-options: -fprof-auto-exported
2626
build-depends:
27-
base >=4.12 && <4.21
27+
base >=4.12 && <4.22
2828
, bytestring >=0.10 && <0.13
2929
, gargoyle >=0.1 && <0.2
3030
, gargoyle-postgresql >=0.2 && <0.3

gargoyle-postgresql/gargoyle-postgresql.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ description:
3333
> withDb dbPath a = withGargoyle defaultPostgres dbPath $ \dbUri -> a =<< connectPostgreSQL dbUri
3434

3535
extra-source-files: ChangeLog.md
36-
tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.8.2 || ==9.10.1
36+
tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.8.2 || ==9.10.1 || ==9.12.2
3737

3838
-- Requires postgres to be in the environment to run
3939
flag enable-psql-test
@@ -45,7 +45,7 @@ library
4545
ghc-options: -Wall
4646
ghc-prof-options: -fprof-auto-exported
4747
build-depends:
48-
base >=4.12 && <4.21
48+
base >=4.12 && <4.22
4949
, bytestring >=0.10 && <0.13
5050
, directory >=1.3 && <1.4
5151
, gargoyle >=0.1.1.0 && < 0.2

gargoyle/gargoyle.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ extra-source-files:
2222
ChangeLog.md
2323
README.md
2424

25-
tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.8.2 || == 9.10.1
25+
tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.8.2 || ==9.10.1 || ==9.12.2
2626

2727
library
2828
exposed-modules: Gargoyle
2929
ghc-options: -Wall
3030
ghc-prof-options: -fprof-auto-exported
3131
build-depends:
32-
base >=4.12.0 && <4.21
32+
base >=4.12.0 && <4.22
3333
, directory >=1.3.3 && <1.4
3434
, filelock >=0.1.1 && <0.2
3535
, filepath >=1.4.2 && <1.6

0 commit comments

Comments
 (0)