Skip to content

Commit

Permalink
Relax hasql-pool dependency and move CI to cabal
Browse files Browse the repository at this point in the history
  • Loading branch information
diogob committed Apr 11, 2024
1 parent 8bf5ba4 commit 9998817
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 17 deletions.
31 changes: 15 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,12 @@ on:

jobs:
stack:
name: stack / ${{ matrix.os }} / ghc ${{ matrix.ghc }}
name: build / ${{ matrix.os }} / ghc ${{ matrix.ghc }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest]
stack: ["2.5.1"]
ghc: ["8.10.4"]
ghc: ["9.6.3"]

services:
postgres:
Expand All @@ -31,29 +30,29 @@ jobs:
ports:
- 5432:5432
steps:
- uses: actions/checkout@v2
if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/main'
- uses: actions/checkout@v4

- uses: haskell/actions/setup@v1
name: Setup Haskell Stack
- uses: haskell-actions/setup@v2
name: Setup Haskell
with:
ghc-version: ${{ matrix.ghc }}
stack-version: ${{ matrix.stack }}

- uses: actions/[email protected]
name: Cache ~/.stack
name: Cache ~/dist-newstyle
with:
path: ~/.stack
key: ${{ matrix.os }}-${{ matrix.ghc }}-stack-v3
path: ~/dist-newstyle
key: ${{ matrix.os }}-${{ matrix.ghc }}-v3

- name: Build Dependencies
run: |
stack build --system-ghc --test --no-run-tests --only-dependencies
cabal build --only-dependencies
cabal install hspec-discover
- name: Build
run: |
stack build --system-ghc --test --no-run-tests
cabal build
- name: Test
run: |
cabal test
# - name: Test
# run: |
# stack test --system-ghc
2 changes: 1 addition & 1 deletion hasql-notifications.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ library
build-depends: base >= 4.7 && < 5
, bytestring >= 0.10.8.2
, text >= 2 && < 2.2
, hasql-pool >= 0.4 && < 0.11
, hasql-pool >= 0.4 && < 1.1
, bytestring >= 0.10
, postgresql-libpq >= 0.9 && < 1.0
, hasql >= 0.19
Expand Down

0 comments on commit 9998817

Please sign in to comment.