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

Build fixes #59

Merged
merged 1 commit into from
Dec 27, 2024
Merged

Build fixes #59

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
11 changes: 6 additions & 5 deletions .github/workflows/haskell.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ["9.6.5", "9.8.2"]
ghc: ["9.4.8", "9.6.6", "9.8.4", "9.10.1"]
os:
- ubuntu-latest
- windows-latest
# include:
# - ghc: "9.8.2"
# os: macOS-latest
include:
- ghc: "9.10.1"
os: macOS-latest
- ghc: "9.10.1"
os: windows-latest

env:
# Modify this value to "invalidate" the cabal cache.
Expand Down
1 change: 1 addition & 0 deletions cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ packages: .
allow-newer:
base,
bytestring,
containers,

package testcontainers
ghc-options: -XDuplicateRecordFields
Expand Down
3 changes: 2 additions & 1 deletion core/HaskellWorks/Polysemy/Cabal.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import HaskellWorks.Polysemy.Error.Types
import HaskellWorks.Polysemy.Prelude
import HaskellWorks.Polysemy.System.Directory
import HaskellWorks.Polysemy.System.Environment
import System.FilePath (takeDirectory)
import System.FilePath (takeDirectory,
(</>))

import Data.Aeson
import qualified Data.List as L
Expand Down
3 changes: 1 addition & 2 deletions core/HaskellWorks/Polysemy/Data/ByteString/Strict.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,7 @@ import qualified Control.Exception as CE
import qualified Data.ByteString as BS
import qualified Data.Text as Text
import qualified Data.Text.Encoding as Text
import GHC.Foreign (CString, CStringLen)
import GHC.IO.Handle (Handle)
import Foreign.C.String (CString, CStringLen)
import HaskellWorks.Polysemy.Prelude

import Polysemy
Expand Down
1 change: 1 addition & 0 deletions hedgehog/HaskellWorks/Polysemy/Hedgehog/Workspace.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import HaskellWorks.Polysemy.System.IO.Temp
import Polysemy
import Polysemy.Log
import Polysemy.Reader
import System.FilePath ((</>))
import System.Info

import qualified HaskellWorks.Polysemy.System.IO as PIO
Expand Down
7 changes: 4 additions & 3 deletions hw-polysemy.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ maintainer: [email protected]
copyright: 2024 John Ky
category: Development
build-type: Simple
tested-with: GHC == 9.10.1, GHC == 9.8.4, GHC == 9.6.6, GHC == 9.4.8
extra-doc-files: CHANGELOG.md
extra-source-files: README.md

Expand All @@ -27,18 +28,18 @@ common amazonka-s3 { build-depends: amazonka-s3 >=
common binary { build-depends: binary >= 0.8.9 && < 0.9 }
common bytestring { build-depends: bytestring < 0.13 }
common contravariant { build-depends: contravariant < 1.6 }
common Diff { build-depends: Diff < 0.6 }
common Diff { build-depends: Diff < 2 }
common directory { build-depends: directory < 1.4 }
common exceptions { build-depends: exceptions < 0.11 }
common filepath { build-depends: filepath < 1.6 }
common generic-lens { build-depends: generic-lens < 2.3 }
common ghc-prim { build-depends: ghc-prim < 0.12 }
common ghc-prim { build-depends: ghc-prim < 0.14 }
common hedgehog { build-depends: hedgehog < 1.6 }
common http-conduit { build-depends: http-conduit >= 2.3 && < 2.4 }
common hw-prelude { build-depends: hw-prelude >= 0.0.1.0 && < 0.1 }
common microlens { build-depends: microlens < 5 }
common lens { build-depends: lens < 5.4 }
common mtl { build-depends: mtl < 2.4 }
common mtl { build-depends: mtl < 2.6 }
common network { build-depends: network < 3.3 }
common polysemy { build-depends: polysemy < 2 }
common polysemy-log { build-depends: polysemy-log >= 0.11 && < 1 }
Expand Down
1 change: 1 addition & 0 deletions test/HaskellWorks/Polysemy/HedgehogSpec.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import qualified Data.List as L
import qualified HaskellWorks.Polysemy.Data.Text as T
import HaskellWorks.Polysemy.Hedgehog
import HaskellWorks.Polysemy.Hedgehog.Test
import System.FilePath ((</>))

default (String)

Expand Down
7 changes: 5 additions & 2 deletions test/HaskellWorks/Polysemy/TestContainers/LocalStackSpec.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,13 @@ import qualified TestContainers.Tasty as TC
isWindows :: Bool
isWindows = OS.os == "mingw32"

isMacos :: Bool
isMacos = OS.os == "darwin"

tasty_local_stack :: Tasty.TestTree
tasty_local_stack =
if isWindows
then Tasty.testGroup "LocalStackSpec skipped on Windows" []
if isWindows || isMacos
then Tasty.testGroup "LocalStackSpec skipped on Windows and MacOS" []
else
TC.withContainers (setupContainers' "localstack/localstack-pro:3.7.2") $ \getContainer ->
H.testProperty "Local stack test" $ propertyOnce $ runLocalTestEnv getContainer $ do
Expand Down
Loading