Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
tchoutri committed Apr 23, 2024
1 parent 6d65208 commit 9a900d9
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 5 deletions.
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Set update schedule for GitHub Actions

version: 2
updates:

- package-ecosystem: "github-actions"
directory: "/"
schedule:
# Check for updates to GitHub Actions every week
interval: "weekly"
6 changes: 6 additions & 0 deletions .github/workflows/install-system-dependencies.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env bash

case "$(uname -s)" in
Linux*) sudo apt install postgresql;;
Darwin*) brew install postgresql openssl;;
esac
7 changes: 4 additions & 3 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ jobs:
with:
cabal-file: servant/servant.cabal
ubuntu-version: "latest"
macos-version: "latest"
version: 0.1.7.0
tests:
name: ${{ matrix.ghc }} on ${{ matrix.os }}
Expand All @@ -29,8 +28,7 @@ jobs:
matrix: ${{ fromJSON(needs.generate-matrix.outputs.matrix) }}
steps:
- uses: actions/checkout@v2

- uses: haskell/actions/setup@v2
- uses: haskell-actions/setup@v2
id: setup-haskell-cabal
name: Setup Haskell
with:
Expand All @@ -51,6 +49,9 @@ jobs:
key: ${{ runner.os }}-ghc-${{ matrix.ghc }}-cabal-${{ hashFiles('**/plan.json') }}
restore-keys: ${{ runner.os }}-ghc-${{ matrix.ghc }}-

- name: Install system dependencies
run: |
./.github/workflows/install-system-dependencies.sh
- name: Install doctest
run: |
cabal install --ignore-project -j2 doctest --constraint='doctest ^>=0.22'
Expand Down
6 changes: 4 additions & 2 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@ packages:
servant-auth/servant-auth-server
servant-auth/servant-auth-swagger

servant-client/
servant-client-core/
servant-http-streams/
servant-client/
servant-docs/
servant-foreign/
servant-http-streams/
servant-quickcheck/
servant-server/
servant-swagger/

doc/tutorial/

-- servant streaming
Expand Down

0 comments on commit 9a900d9

Please sign in to comment.