Skip to content

Commit

Permalink
Update dependencies to make everything build
Browse files Browse the repository at this point in the history
  • Loading branch information
@LaurentRDC
LaurentRDC committed Aug 31, 2024
1 parent 9fb3f1b commit 5191ece
Show file tree
Hide file tree
Showing 12 changed files with 95 additions and 42 deletions.
55 changes: 55 additions & 0 deletions .github/workflows/cabal.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: Continuous integration with cabal

on: [push, pull_request]

jobs:
continuous-integration:
strategy:
matrix:
ghc-version:
- "9.0.2"
- "9.2.8"
- "9.4.5"
- "9.6.4"
- "9.8.2"
- "9.10.1"

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Install cabal/ghc
uses: haskell-actions/setup@v2
id: setup-haskell
with:
ghc-version: ${{ matrix.ghc-version }}
cabal-version: '3.10.3.0'

- name: Generate freeze file
run: |
cabal update
cabal configure --disable-optimization --enable-tests
cabal freeze
# 'cabal freeze' will use the nearest index state which might not be exactly equal
# to the index state specified in 'cabal.project'
sed '/^index-state: /d' cabal.project.freeze > dependencies-versions
- name: Cache cabal work
uses: actions/cache@v4
with:
path: |
dist-newstyle
${{ steps.setup-haskell.outputs.cabal-store }}
# We are using the hash of 'cabal.project.local' so that different levels
# of optimizations are cached separately
key: ${{ runner.os }}-${{ hashFiles('dependencies-versions', 'cabal.project', 'cabal.project.local') }}-cabal-install

- name: Build dependencies only
run: cabal build all --only-dependencies

- name: Build all packages
run: cabal build all

- name: Run all tests
run: cabal test all
2 changes: 1 addition & 1 deletion .github/workflows/distributed-process-ci.yml → .github/workflows/stack.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: distributed-process-ci
name: Continuous integration with stack
on: [push, pull_request]
jobs:
test:
Expand Down
6 changes: 2 additions & 4 deletions cabal.project
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
packages: packages/*/**.cabal

allow-newer: distributed-static:containers
, distributed-process-extras:containers
, distributed-process-extras:hashable
, distributed-process-extras:stm
package distributed-process-tests
flags: +tcp
4 changes: 2 additions & 2 deletions packages/distributed-process-async/distributed-process-async.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ library
deepseq >= 1.3.0.1 && < 1.6,
mtl,
containers >= 0.4 && < 0.8,
hashable >= 1.2.0.5 && < 1.5,
hashable >= 1.2.0.5 && < 1.6,
unordered-containers >= 0.2.3.0 && < 0.3,
fingertree < 0.2,
stm >= 2.4 && < 2.6,
Expand Down Expand Up @@ -63,7 +63,7 @@ test-suite AsyncTests
binary >= 0.6.3.0 && < 0.9,
deepseq >= 1.3.0.1 && < 1.6,
-- HUnit >= 1.2 && < 2,
stm >= 2.3 && < 2.5,
stm >= 2.3 && < 2.6,
test-framework >= 0.6 && < 0.9,
test-framework-hunit,
rematch >= 0.2.0.0,
Expand Down
2 changes: 1 addition & 1 deletion packages/distributed-process-client-server/distributed-process-client-server.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ library
unordered-containers >= 0.2.3.0 && < 0.3,
fingertree < 0.2,
stm >= 2.4 && < 2.6,
time > 1.4 && < 1.9.2,
time > 1.4 && < 1.15,
transformers,
exceptions >= 0.5 && < 0.11
if impl(ghc <= 7.5)
Expand Down
18 changes: 9 additions & 9 deletions packages/distributed-process-execution/distributed-process-execution.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,18 @@ library
build-depends:
base >= 4.4 && < 5,
data-accessor >= 0.2.2.3,
distributed-process >= 0.6.6 && < 0.7,
distributed-process >= 0.6.6 && < 0.8,
distributed-process-extras >= 0.3.1 && < 0.4,
distributed-process-supervisor >= 0.2.0 && < 0.3,
distributed-process-client-server >= 0.2.0 && < 0.3,
binary >= 0.6.3.0 && < 0.9,
deepseq >= 1.3.0.1 && < 1.5,
deepseq >= 1.3.0.1 && < 1.6,
mtl,
containers >= 0.4 && < 0.6,
hashable >= 1.2.0.5 && < 1.3,
containers >= 0.4 && < 0.8,
hashable >= 1.2.0.5 && < 1.6,
unordered-containers >= 0.2.3.0 && < 0.3,
fingertree < 0.2,
stm >= 2.4 && < 2.5,
stm >= 2.4 && < 2.6,
time,
transformers
if impl(ghc <= 7.5)
Expand Down Expand Up @@ -80,13 +80,13 @@ test-suite ExchangeTests
data-accessor,
fingertree < 0.2,
network-transport >= 0.4 && < 0.5,
deepseq >= 1.3.0.1 && < 1.5,
deepseq,
mtl,
network-transport-tcp >= 0.4 && < 0.6,
binary >= 0.6.3.0 && < 0.9,
network >= 2.3 && < 2.7,
HUnit >= 1.2 && < 2,
stm >= 2.3 && < 2.5,
stm,
time,
test-framework >= 0.6 && < 0.9,
test-framework-hunit,
Expand Down Expand Up @@ -120,13 +120,13 @@ test-suite MailboxTests
data-accessor,
fingertree < 0.2,
network-transport >= 0.4 && < 0.5,
deepseq >= 1.3.0.1 && < 1.5,
deepseq,
mtl,
network-transport-tcp >= 0.4 && < 0.6,
binary >= 0.6.3.0 && < 0.9,
network >= 2.3 && < 2.7,
HUnit >= 1.2 && < 2,
stm >= 2.3 && < 2.5,
stm,
time,
test-framework >= 0.6 && < 0.9,
test-framework-hunit,
Expand Down
20 changes: 10 additions & 10 deletions packages/distributed-process-extras/distributed-process-extras.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ library
binary >= 0.6.3.0 && < 0.9,
deepseq >= 1.3.0.1 && < 1.6,
mtl >= 2.0 && < 2.4,
containers >= 0.4 && < 0.6,
containers >= 0.4 && < 0.8,
exceptions >= 0.5,
hashable >= 1.2.0.5 && < 1.3,
hashable >= 1.2.0.5 && < 1.6,
unordered-containers >= 0.2.3.0 && < 0.3,
fingertree < 0.2,
stm >= 2.4 && < 2.5,
stm >= 2.4 && < 2.6,
transformers >= 0.2 && < 0.6
if flag(old-locale)
Build-Depends: time < 1.5, old-locale >= 1.0 && <1.1
Expand Down Expand Up @@ -99,13 +99,13 @@ test-suite PrimitivesTests
distributed-process-systest >= 0.1.0 && < 0.3.0,
network-transport >= 0.4 && < 0.6,
mtl,
containers >= 0.4 && < 0.6,
containers,
network-transport-tcp >= 0.4 && < 0.6,
binary >= 0.6.3.0 && < 0.9,
deepseq >= 1.3.0.1 && < 1.6,
deepseq,
network >= 2.3 && < 2.7,
HUnit >= 1.2 && < 2,
stm >= 2.3 && < 2.5,
stm,
test-framework >= 0.6 && < 0.9,
test-framework-hunit,
rematch >= 0.2.0.0,
Expand All @@ -122,7 +122,7 @@ test-suite TimerTests
build-depends:
base >= 4.6 && < 5,
ansi-terminal >= 0.5 && < 0.9,
deepseq >= 1.3.0.1 && < 1.6,
deepseq,
distributed-process >= 0.6.0 && < 0.8,
distributed-process-extras,
distributed-process-systest >= 0.1.0 && < 0.3.0,
Expand Down Expand Up @@ -159,14 +159,14 @@ test-suite LoggerTests
data-accessor,
fingertree < 0.2,
network-transport >= 0.4 && < 0.6,
deepseq >= 1.3.0.1 && < 1.6,
deepseq,
mtl,
network-transport-tcp >= 0.4 && < 0.6,
binary >= 0.6.3.0 && < 0.9,
network >= 2.3 && < 2.7,
HUnit >= 1.2 && < 2,
stm >= 2.3 && < 2.5,
time > 1.4 && < 1.9,
stm,
time > 1.4 && < 1.15,
test-framework >= 0.6 && < 0.9,
test-framework-hunit,
transformers,
Expand Down
22 changes: 11 additions & 11 deletions packages/distributed-process-supervisor/distributed-process-supervisor.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ library
distributed-process-extras >= 0.3.1 && < 0.4,
distributed-process-client-server >= 0.2.0 && < 0.4,
binary >= 0.6.3.0 && < 0.9,
deepseq >= 1.3.0.1 && < 1.5,
deepseq >= 1.3.0.1 && < 1.6,
mtl,
containers >= 0.4 && < 0.6,
hashable >= 1.2.0.5 && < 1.3,
containers >= 0.4 && < 0.8,
hashable >= 1.2.0.5 && < 1.6,
unordered-containers >= 0.2.3.0 && < 0.3,
fingertree < 0.2,
stm >= 2.4 && < 2.5,
time > 1.4 && < 1.9,
stm >= 2.4 && < 2.6,
time > 1.4 && < 1.15,
transformers,
exceptions >= 0.8.3 && < 0.11
extensions: CPP
Expand Down Expand Up @@ -79,11 +79,11 @@ test-suite SupervisorTests
mtl,
network-transport-tcp >= 0.4 && < 0.7,
binary >= 0.6.3.0 && < 0.9,
deepseq >= 1.3.0.1 && < 1.5,
deepseq,
network >= 2.3 && < 2.7,
HUnit >= 1.2 && < 2,
stm >= 2.3 && < 2.5,
time > 1.4 && < 1.9,
stm,
time,
test-framework >= 0.6 && < 0.9,
test-framework-hunit,
transformers,
Expand Down Expand Up @@ -119,11 +119,11 @@ test-suite NonThreadedSupervisorTests
mtl,
network-transport-tcp >= 0.4 && < 0.7,
binary >= 0.6.3.0 && < 0.9,
deepseq >= 1.3.0.1 && < 1.5,
deepseq,
network >= 2.3 && < 2.7,
HUnit >= 1.2 && < 2,
stm >= 2.3 && < 2.5,
time > 1.4 && < 1.9,
stm,
time,
test-framework >= 0.6 && < 0.9,
test-framework-hunit,
transformers,
Expand Down
2 changes: 1 addition & 1 deletion packages/distributed-process-supervisor/src/Control/Distributed/Process/Supervisor/Types.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ type ChildPid = ProcessId
-- | The maximum number of restarts a supervisor will tollerate, created by
-- evaluating "maxRestarts".
newtype MaxRestarts = MaxR { maxNumberOfRestarts :: Int }
deriving (Typeable, Generic, Show)
deriving (Typeable, Generic, Show, Eq)
instance Binary MaxRestarts where
instance Hashable MaxRestarts where
instance NFData MaxRestarts where
Expand Down
2 changes: 1 addition & 1 deletion packages/distributed-process/distributed-process.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ flag old-locale
Library
Build-Depends: base >= 4.9 && < 5,
binary >= 0.6.3 && < 0.10,
hashable >= 1.2.0.5 && < 1.5,
hashable >= 1.2.0.5 && < 1.6,
network-transport >= 0.4.1.0 && < 0.6,
stm >= 2.4 && < 2.6,
transformers >= 0.2 && < 0.7,
Expand Down
2 changes: 1 addition & 1 deletion packages/network-transport-tcp/network-transport-tcp.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Library
async >= 2.2 && < 2.3,
network-transport >= 0.5 && < 0.6,
data-accessor >= 0.2 && < 0.3,
containers >= 0.4 && < 0.7,
containers >= 0.4 && < 0.8,
bytestring >= 0.9 && < 0.13,
network >= 3.1 && < 3.3,
uuid >= 1.3 && < 1.4
Expand Down
2 changes: 1 addition & 1 deletion packages/network-transport/network-transport.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ Library
Build-Depends: base >= 4.6 && < 5,
binary >= 0.5 && < 0.9,
bytestring >= 0.9 && < 0.13,
hashable >= 1.2.0.5 && < 1.5,
hashable >= 1.2.0.5 && < 1.6,
transformers >= 0.2 && < 0.7,
deepseq >= 1.0 && < 1.6
if impl(ghc < 7.6)
Expand Down

0 comments on commit 5191ece

Please sign in to comment.