Merge pull request #1737 from haskell-servant/tests-fix

Fix tests

Author: tchoutri

.github/dependabot.yml

@@ -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"

.github/workflows/install-system-dependencies.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+case "$(uname -s)" in
+        Linux*) sudo apt install postgresql;;
+        Darwin*) brew install postgresql openssl;;
+esac

.github/workflows/master.yml

@@ -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 }}
@@ -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:
@@ -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'

cabal.project

@@ -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