Skip to content

Commit

Permalink
Fix CI
Browse files Browse the repository at this point in the history
* Disable the build of servant-http-streams due to broken HsOpenSSL
* Install missing liblzma
  • Loading branch information
tchoutri committed Jan 14, 2025
1 parent 1e6e566 commit a09ce49
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/install-system-dependencies.sh
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-devel;;
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 @@ -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
2 changes: 1 addition & 1 deletion cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ packages:
servant-auth/servant-auth-swagger
servant-docs/
servant-foreign/
servant-http-streams/
--servant-http-streams/
servant-quickcheck/
servant-swagger/

Expand Down
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

0 comments on commit a09ce49

Please sign in to comment.