Skip to content

Commit

Permalink
Merge pull request #370 from haskell-distributed/lts-20.12-pull
Browse files Browse the repository at this point in the history
Lts 20.19 (building off of #368)
  • Loading branch information
davidsd committed May 1, 2023
2 parents 7b8cbf5 + 43c683b commit b4acb79
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/distributed-process-ci.yml
Expand Up @@ -6,12 +6,12 @@ jobs:
strategy:
matrix:
ghcVersion:
[ "8.2.2"
, "8.4.4"
[ "8.4.4"
, "8.6.5"
, "8.8.4"
, "8.10.7"
, "9.0.2"
, "9.2.7"
]
container: "fpco/stack-build-small"
steps:
Expand Down
24 changes: 12 additions & 12 deletions distributed-process.cabal
Expand Up @@ -43,13 +43,13 @@ flag old-locale
Library
Build-Depends: base >= 4.6 && < 5,
binary >= 0.6.3 && < 0.10,
hashable >= 1.2.0.5 && < 1.4,
hashable >= 1.2.0.5 && <= 1.4.2.0,
network-transport >= 0.4.1.0 && < 0.6,
stm >= 2.4 && < 2.6,
transformers >= 0.2 && < 0.6,
mtl >= 2.0 && < 2.4,
data-accessor >= 0.2 && < 0.3,
bytestring >= 0.9 && < 0.11,
bytestring >= 0.9 && <= 0.12,
random >= 1.0 && < 1.3,
distributed-static >= 0.2 && < 0.4,
rank1dynamic >= 0.1 && < 0.5,
Expand Down Expand Up @@ -121,8 +121,8 @@ benchmark distributed-process-throughput
Type: exitcode-stdio-1.0
Build-Depends: base >= 4.6 && < 5,
distributed-process,
network-transport-tcp >= 0.3 && < 0.7,
bytestring >= 0.9 && < 0.11,
network-transport-tcp >= 0.3 && <= 0.81,
bytestring >= 0.9 && <= 0.12,
binary >= 0.6.3 && < 0.10
Main-Is: benchmarks/Throughput.hs
ghc-options: -Wall
Expand All @@ -131,8 +131,8 @@ benchmark distributed-process-latency
Type: exitcode-stdio-1.0
Build-Depends: base >= 4.6 && < 5,
distributed-process,
network-transport-tcp >= 0.3 && < 0.7,
bytestring >= 0.9 && < 0.11,
network-transport-tcp >= 0.3 && <= 0.81,
bytestring >= 0.9 && <= 0.12,
binary >= 0.6.3 && < 0.10
Main-Is: benchmarks/Latency.hs
ghc-options: -Wall
Expand All @@ -141,8 +141,8 @@ benchmark distributed-process-channels
Type: exitcode-stdio-1.0
Build-Depends: base >= 4.6 && < 5,
distributed-process,
network-transport-tcp >= 0.3 && < 0.7,
bytestring >= 0.9 && < 0.11,
network-transport-tcp >= 0.3 && <= 0.81,
bytestring >= 0.9 && <= 0.12,
binary >= 0.6.3 && < 0.10
Main-Is: benchmarks/Channels.hs
ghc-options: -Wall
Expand All @@ -151,8 +151,8 @@ benchmark distributed-process-spawns
Type: exitcode-stdio-1.0
Build-Depends: base >= 4.6 && < 5,
distributed-process,
network-transport-tcp >= 0.3 && < 0.7,
bytestring >= 0.9 && < 0.11,
network-transport-tcp >= 0.3 && <= 0.81,
bytestring >= 0.9 && <= 0.12,
binary >= 0.6.3 && < 0.10
Main-Is: benchmarks/Spawns.hs
ghc-options: -Wall
Expand All @@ -161,8 +161,8 @@ benchmark distributed-process-ring
Type: exitcode-stdio-1.0
Build-Depends: base >= 4.6 && < 5,
distributed-process,
network-transport-tcp >= 0.3 && < 0.7,
bytestring >= 0.9 && < 0.11,
network-transport-tcp >= 0.3 && <= 0.81,
bytestring >= 0.9 && <= 0.12,
binary >= 0.6.3 && < 0.10
Main-Is: benchmarks/ProcessRing.hs
ghc-options: -Wall -threaded -O2 -rtsopts
19 changes: 19 additions & 0 deletions stack-ghc-9.2.7.yaml
@@ -0,0 +1,19 @@
resolver: lts-20.19 # Use GHC 9.2.7

packages:
- .
- distributed-process-tests/

extra-deps:
# Both distributed-static and network-transport-inmemory have
# revisions on hackage that bump dependencies like containers and
# bytestring. Explicit sha256 hashes seem to be needed to get the
# right revisions (4/30/23).
- distributed-static-0.3.9@sha256:f5e781867eddec660cb3b39805c849e3f096b7da245d43a07d8529e3c92b3a27
- network-transport-inmemory-0.5.2@sha256:eead1fb207672127ccca1d04ae6a0eb20ee6ec10223eefb4274694dbbf4e9908
- rematch-0.2.0.0
- network-transport-tcp-0.8.1

flags:
distributed-process-tests:
tcp: true
2 changes: 1 addition & 1 deletion stack.yaml

0 comments on commit b4acb79

Please sign in to comment.