Skip to content

Commit 7231b5a

Browse files
authored
Merge pull request #23 from diogob/relax-hasql-pool-upper-bound
Relax hasql-pool dependency and move CI to cabal
2 parents 8bf5ba4 + 9998817 commit 7231b5a

File tree

2 files changed

+16
-17
lines changed

2 files changed

+16
-17
lines changed

.github/workflows/ci.yml

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@ on:
88

99
jobs:
1010
stack:
11-
name: stack / ${{ matrix.os }} / ghc ${{ matrix.ghc }}
11+
name: build / ${{ matrix.os }} / ghc ${{ matrix.ghc }}
1212
runs-on: ${{ matrix.os }}
1313
strategy:
1414
matrix:
1515
os: [ubuntu-latest]
16-
stack: ["2.5.1"]
17-
ghc: ["8.10.4"]
16+
ghc: ["9.6.3"]
1817

1918
services:
2019
postgres:
@@ -31,29 +30,29 @@ jobs:
3130
ports:
3231
- 5432:5432
3332
steps:
34-
- uses: actions/checkout@v2
35-
if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/main'
33+
- uses: actions/checkout@v4
3634

37-
- uses: haskell/actions/setup@v1
38-
name: Setup Haskell Stack
35+
- uses: haskell-actions/setup@v2
36+
name: Setup Haskell
3937
with:
4038
ghc-version: ${{ matrix.ghc }}
41-
stack-version: ${{ matrix.stack }}
4239

4340
- uses: actions/cache@v2.1.3
44-
name: Cache ~/.stack
41+
name: Cache ~/dist-newstyle
4542
with:
46-
path: ~/.stack
47-
key: ${{ matrix.os }}-${{ matrix.ghc }}-stack-v3
43+
path: ~/dist-newstyle
44+
key: ${{ matrix.os }}-${{ matrix.ghc }}-v3
4845

4946
- name: Build Dependencies
5047
run: |
51-
stack build --system-ghc --test --no-run-tests --only-dependencies
48+
cabal build --only-dependencies
49+
cabal install hspec-discover
5250
5351
- name: Build
5452
run: |
55-
stack build --system-ghc --test --no-run-tests
53+
cabal build
54+
55+
- name: Test
56+
run: |
57+
cabal test
5658
57-
# - name: Test
58-
# run: |
59-
# stack test --system-ghc

hasql-notifications.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ library
1919
build-depends: base >= 4.7 && < 5
2020
, bytestring >= 0.10.8.2
2121
, text >= 2 && < 2.2
22-
, hasql-pool >= 0.4 && < 0.11
22+
, hasql-pool >= 0.4 && < 1.1
2323
, bytestring >= 0.10
2424
, postgresql-libpq >= 0.9 && < 1.0
2525
, hasql >= 0.19

0 commit comments

Comments
 (0)