Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CI #1801

Merged
merged 1 commit into from
Jan 14, 2025
Merged

Fix CI #1801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/install-system-dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

case "$(uname -s)" in
Linux*) sudo apt install postgresql;;
Linux*) sudo apt install postgresql liblzma-dev;;
Darwin*) brew install postgresql openssl;;
esac
7 changes: 4 additions & 3 deletions .github/workflows/master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ jobs:
ghc-version: ${{ matrix.ghc }}
cabal-version: 'latest'

- name: Install system dependencies
run: |
./.github/workflows/install-system-dependencies.sh

- name: Freeze
run: |
cabal configure --enable-tests --enable-benchmarks --test-show-details=direct
Expand All @@ -49,9 +53,6 @@ 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
5 changes: 2 additions & 3 deletions doc/cookbook/hoist-server-with-context/HoistServerWithContext.lhs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,9 @@ This recipe uses the following ingredients:
import Prelude ()
import Prelude.Compat

import Control.Monad.IO.Class (liftIO)
import Control.Monad.Reader
import Data.Aeson
import Data.Default
import Data.Default (def)
import Data.Proxy
import Data.Text
import Data.Time.Clock ( UTCTime, getCurrentTime )
Expand All @@ -48,7 +47,7 @@ import Network.Wai.Middleware.RequestLogger
import Network.Wai.Middleware.RequestLogger.JSON
import Servant as S
import Servant.Auth as SA
import Servant.Auth.Server as SAS
import Servant.Auth.Server as SAS hiding (def)
import System.Log.FastLogger ( ToLogStr(..)
, LoggerSet
, defaultBufSize
Expand Down
Loading