Skip to content

Commit 5191ece

Browse files
LaurentRDCLaurentRDC
committed
Update dependencies to make everything build
1 parent 9fb3f1b commit 5191ece

File tree

12 files changed

+95
-42
lines changed

12 files changed

+95
-42
lines changed

‎.github/workflows/cabal.yml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
name: Continuous integration with cabal
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
continuous-integration:
7+
strategy:
8+
matrix:
9+
ghc-version:
10+
- "9.0.2"
11+
- "9.2.8"
12+
- "9.4.5"
13+
- "9.6.4"
14+
- "9.8.2"
15+
- "9.10.1"
16+
17+
runs-on: ubuntu-latest
18+
19+
steps:
20+
- uses: actions/checkout@v4
21+
22+
- name: Install cabal/ghc
23+
uses: haskell-actions/setup@v2
24+
id: setup-haskell
25+
with:
26+
ghc-version: ${{ matrix.ghc-version }}
27+
cabal-version: '3.10.3.0'
28+
29+
- name: Generate freeze file
30+
run: |
31+
cabal update
32+
cabal configure --disable-optimization --enable-tests
33+
cabal freeze
34+
# 'cabal freeze' will use the nearest index state which might not be exactly equal
35+
# to the index state specified in 'cabal.project'
36+
sed '/^index-state: /d' cabal.project.freeze > dependencies-versions
37+
38+
- name: Cache cabal work
39+
uses: actions/cache@v4
40+
with:
41+
path: |
42+
dist-newstyle
43+
${{ steps.setup-haskell.outputs.cabal-store }}
44+
# We are using the hash of 'cabal.project.local' so that different levels
45+
# of optimizations are cached separately
46+
key: ${{ runner.os }}-${{ hashFiles('dependencies-versions', 'cabal.project', 'cabal.project.local') }}-cabal-install
47+
48+
- name: Build dependencies only
49+
run: cabal build all --only-dependencies
50+
51+
- name: Build all packages
52+
run: cabal build all
53+
54+
- name: Run all tests
55+
run: cabal test all

‎.github/workflows/distributed-process-ci.yml renamed to ‎.github/workflows/stack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: distributed-process-ci
1+
name: Continuous integration with stack
22
on: [push, pull_request]
33
jobs:
44
test:

‎cabal.project

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
packages: packages/*/**.cabal
22

3-
allow-newer: distributed-static:containers
4-
, distributed-process-extras:containers
5-
, distributed-process-extras:hashable
6-
, distributed-process-extras:stm
3+
package distributed-process-tests
4+
flags: +tcp

‎packages/distributed-process-async/distributed-process-async.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ library
3131
deepseq >= 1.3.0.1 && < 1.6,
3232
mtl,
3333
containers >= 0.4 && < 0.8,
34-
hashable >= 1.2.0.5 && < 1.5,
34+
hashable >= 1.2.0.5 && < 1.6,
3535
unordered-containers >= 0.2.3.0 && < 0.3,
3636
fingertree < 0.2,
3737
stm >= 2.4 && < 2.6,
@@ -63,7 +63,7 @@ test-suite AsyncTests
6363
binary >= 0.6.3.0 && < 0.9,
6464
deepseq >= 1.3.0.1 && < 1.6,
6565
-- HUnit >= 1.2 && < 2,
66-
stm >= 2.3 && < 2.5,
66+
stm >= 2.3 && < 2.6,
6767
test-framework >= 0.6 && < 0.9,
6868
test-framework-hunit,
6969
rematch >= 0.2.0.0,

‎packages/distributed-process-client-server/distributed-process-client-server.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ library
3737
unordered-containers >= 0.2.3.0 && < 0.3,
3838
fingertree < 0.2,
3939
stm >= 2.4 && < 2.6,
40-
time > 1.4 && < 1.9.2,
40+
time > 1.4 && < 1.15,
4141
transformers,
4242
exceptions >= 0.5 && < 0.11
4343
if impl(ghc <= 7.5)

‎packages/distributed-process-execution/distributed-process-execution.cabal

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,18 @@ library
2929
build-depends:
3030
base >= 4.4 && < 5,
3131
data-accessor >= 0.2.2.3,
32-
distributed-process >= 0.6.6 && < 0.7,
32+
distributed-process >= 0.6.6 && < 0.8,
3333
distributed-process-extras >= 0.3.1 && < 0.4,
3434
distributed-process-supervisor >= 0.2.0 && < 0.3,
3535
distributed-process-client-server >= 0.2.0 && < 0.3,
3636
binary >= 0.6.3.0 && < 0.9,
37-
deepseq >= 1.3.0.1 && < 1.5,
37+
deepseq >= 1.3.0.1 && < 1.6,
3838
mtl,
39-
containers >= 0.4 && < 0.6,
40-
hashable >= 1.2.0.5 && < 1.3,
39+
containers >= 0.4 && < 0.8,
40+
hashable >= 1.2.0.5 && < 1.6,
4141
unordered-containers >= 0.2.3.0 && < 0.3,
4242
fingertree < 0.2,
43-
stm >= 2.4 && < 2.5,
43+
stm >= 2.4 && < 2.6,
4444
time,
4545
transformers
4646
if impl(ghc <= 7.5)
@@ -80,13 +80,13 @@ test-suite ExchangeTests
8080
data-accessor,
8181
fingertree < 0.2,
8282
network-transport >= 0.4 && < 0.5,
83-
deepseq >= 1.3.0.1 && < 1.5,
83+
deepseq,
8484
mtl,
8585
network-transport-tcp >= 0.4 && < 0.6,
8686
binary >= 0.6.3.0 && < 0.9,
8787
network >= 2.3 && < 2.7,
8888
HUnit >= 1.2 && < 2,
89-
stm >= 2.3 && < 2.5,
89+
stm,
9090
time,
9191
test-framework >= 0.6 && < 0.9,
9292
test-framework-hunit,
@@ -120,13 +120,13 @@ test-suite MailboxTests
120120
data-accessor,
121121
fingertree < 0.2,
122122
network-transport >= 0.4 && < 0.5,
123-
deepseq >= 1.3.0.1 && < 1.5,
123+
deepseq,
124124
mtl,
125125
network-transport-tcp >= 0.4 && < 0.6,
126126
binary >= 0.6.3.0 && < 0.9,
127127
network >= 2.3 && < 2.7,
128128
HUnit >= 1.2 && < 2,
129-
stm >= 2.3 && < 2.5,
129+
stm,
130130
time,
131131
test-framework >= 0.6 && < 0.9,
132132
test-framework-hunit,

‎packages/distributed-process-extras/distributed-process-extras.cabal

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ library
3434
binary >= 0.6.3.0 && < 0.9,
3535
deepseq >= 1.3.0.1 && < 1.6,
3636
mtl >= 2.0 && < 2.4,
37-
containers >= 0.4 && < 0.6,
37+
containers >= 0.4 && < 0.8,
3838
exceptions >= 0.5,
39-
hashable >= 1.2.0.5 && < 1.3,
39+
hashable >= 1.2.0.5 && < 1.6,
4040
unordered-containers >= 0.2.3.0 && < 0.3,
4141
fingertree < 0.2,
42-
stm >= 2.4 && < 2.5,
42+
stm >= 2.4 && < 2.6,
4343
transformers >= 0.2 && < 0.6
4444
if flag(old-locale)
4545
Build-Depends: time < 1.5, old-locale >= 1.0 && <1.1
@@ -99,13 +99,13 @@ test-suite PrimitivesTests
9999
distributed-process-systest >= 0.1.0 && < 0.3.0,
100100
network-transport >= 0.4 && < 0.6,
101101
mtl,
102-
containers >= 0.4 && < 0.6,
102+
containers,
103103
network-transport-tcp >= 0.4 && < 0.6,
104104
binary >= 0.6.3.0 && < 0.9,
105-
deepseq >= 1.3.0.1 && < 1.6,
105+
deepseq,
106106
network >= 2.3 && < 2.7,
107107
HUnit >= 1.2 && < 2,
108-
stm >= 2.3 && < 2.5,
108+
stm,
109109
test-framework >= 0.6 && < 0.9,
110110
test-framework-hunit,
111111
rematch >= 0.2.0.0,
@@ -122,7 +122,7 @@ test-suite TimerTests
122122
build-depends:
123123
base >= 4.6 && < 5,
124124
ansi-terminal >= 0.5 && < 0.9,
125-
deepseq >= 1.3.0.1 && < 1.6,
125+
deepseq,
126126
distributed-process >= 0.6.0 && < 0.8,
127127
distributed-process-extras,
128128
distributed-process-systest >= 0.1.0 && < 0.3.0,
@@ -159,14 +159,14 @@ test-suite LoggerTests
159159
data-accessor,
160160
fingertree < 0.2,
161161
network-transport >= 0.4 && < 0.6,
162-
deepseq >= 1.3.0.1 && < 1.6,
162+
deepseq,
163163
mtl,
164164
network-transport-tcp >= 0.4 && < 0.6,
165165
binary >= 0.6.3.0 && < 0.9,
166166
network >= 2.3 && < 2.7,
167167
HUnit >= 1.2 && < 2,
168-
stm >= 2.3 && < 2.5,
169-
time > 1.4 && < 1.9,
168+
stm,
169+
time > 1.4 && < 1.15,
170170
test-framework >= 0.6 && < 0.9,
171171
test-framework-hunit,
172172
transformers,

‎packages/distributed-process-supervisor/distributed-process-supervisor.cabal

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ library
3838
distributed-process-extras >= 0.3.1 && < 0.4,
3939
distributed-process-client-server >= 0.2.0 && < 0.4,
4040
binary >= 0.6.3.0 && < 0.9,
41-
deepseq >= 1.3.0.1 && < 1.5,
41+
deepseq >= 1.3.0.1 && < 1.6,
4242
mtl,
43-
containers >= 0.4 && < 0.6,
44-
hashable >= 1.2.0.5 && < 1.3,
43+
containers >= 0.4 && < 0.8,
44+
hashable >= 1.2.0.5 && < 1.6,
4545
unordered-containers >= 0.2.3.0 && < 0.3,
4646
fingertree < 0.2,
47-
stm >= 2.4 && < 2.5,
48-
time > 1.4 && < 1.9,
47+
stm >= 2.4 && < 2.6,
48+
time > 1.4 && < 1.15,
4949
transformers,
5050
exceptions >= 0.8.3 && < 0.11
5151
extensions: CPP
@@ -79,11 +79,11 @@ test-suite SupervisorTests
7979
mtl,
8080
network-transport-tcp >= 0.4 && < 0.7,
8181
binary >= 0.6.3.0 && < 0.9,
82-
deepseq >= 1.3.0.1 && < 1.5,
82+
deepseq,
8383
network >= 2.3 && < 2.7,
8484
HUnit >= 1.2 && < 2,
85-
stm >= 2.3 && < 2.5,
86-
time > 1.4 && < 1.9,
85+
stm,
86+
time,
8787
test-framework >= 0.6 && < 0.9,
8888
test-framework-hunit,
8989
transformers,
@@ -119,11 +119,11 @@ test-suite NonThreadedSupervisorTests
119119
mtl,
120120
network-transport-tcp >= 0.4 && < 0.7,
121121
binary >= 0.6.3.0 && < 0.9,
122-
deepseq >= 1.3.0.1 && < 1.5,
122+
deepseq,
123123
network >= 2.3 && < 2.7,
124124
HUnit >= 1.2 && < 2,
125-
stm >= 2.3 && < 2.5,
126-
time > 1.4 && < 1.9,
125+
stm,
126+
time,
127127
test-framework >= 0.6 && < 0.9,
128128
test-framework-hunit,
129129
transformers,

‎packages/distributed-process-supervisor/src/Control/Distributed/Process/Supervisor/Types.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ type ChildPid = ProcessId
8080
-- | The maximum number of restarts a supervisor will tollerate, created by
8181
-- evaluating "maxRestarts".
8282
newtype MaxRestarts = MaxR { maxNumberOfRestarts :: Int }
83-
deriving (Typeable, Generic, Show)
83+
deriving (Typeable, Generic, Show, Eq)
8484
instance Binary MaxRestarts where
8585
instance Hashable MaxRestarts where
8686
instance NFData MaxRestarts where

‎packages/distributed-process/distributed-process.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ flag old-locale
4343
Library
4444
Build-Depends: base >= 4.9 && < 5,
4545
binary >= 0.6.3 && < 0.10,
46-
hashable >= 1.2.0.5 && < 1.5,
46+
hashable >= 1.2.0.5 && < 1.6,
4747
network-transport >= 0.4.1.0 && < 0.6,
4848
stm >= 2.4 && < 2.6,
4949
transformers >= 0.2 && < 0.7,

‎packages/network-transport-tcp/network-transport-tcp.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Library
2929
async >= 2.2 && < 2.3,
3030
network-transport >= 0.5 && < 0.6,
3131
data-accessor >= 0.2 && < 0.3,
32-
containers >= 0.4 && < 0.7,
32+
containers >= 0.4 && < 0.8,
3333
bytestring >= 0.9 && < 0.13,
3434
network >= 3.1 && < 3.3,
3535
uuid >= 1.3 && < 1.4

‎packages/network-transport/network-transport.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Library
6767
Build-Depends: base >= 4.6 && < 5,
6868
binary >= 0.5 && < 0.9,
6969
bytestring >= 0.9 && < 0.13,
70-
hashable >= 1.2.0.5 && < 1.5,
70+
hashable >= 1.2.0.5 && < 1.6,
7171
transformers >= 0.2 && < 0.7,
7272
deepseq >= 1.0 && < 1.6
7373
if impl(ghc < 7.6)

0 commit comments

Comments
 (0)