Skip to content
This repository was archived by the owner on Aug 1, 2023. It is now read-only.

Commit 872b100

Browse files
authored
[GH-170] Fix CI Hydra issue (#171)
* [GH-96] Implement actual test from node IPC. * [GH-96] Fix Nix dependency. * [GH-170] Fix CI Hydra issue, clean up Nix deps. * [GH-170] Add Coveralls to Nix, review comment by @jbgi.
1 parent 4f1fb1a commit 872b100

12 files changed

+51
-197
lines changed

cardano-shell.cabal

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,12 @@ test-suite cardano-shell-test
200200
, safe-exceptions
201201
-- quickcheck
202202
, QuickCheck
203+
-- SM
203204
, quickcheck-state-machine >= 0.6
204205
-- required because of QSM
205206
, tree-diff
207+
, pretty-show >=1.9.5
208+
-- tests
206209
, hspec
207210
, hspec-contrib
208211
, concurrency

iohk-monitoring-contra-tracer.nix

Lines changed: 0 additions & 20 deletions
This file was deleted.

iohk-monitoring.nix

Lines changed: 0 additions & 40 deletions
This file was deleted.

libyaml.nix

Lines changed: 0 additions & 10 deletions
This file was deleted.

nix/.stack.nix/cardano-prelude-test.nix

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nix/.stack.nix/cardano-prelude.nix

Lines changed: 29 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nix/.stack.nix/cardano-shell.nix

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nix/.stack.nix/default.nix

Lines changed: 8 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

stack-hpc-coveralls.nix

Lines changed: 0 additions & 31 deletions
This file was deleted.

stack-nix.yaml

Lines changed: 0 additions & 71 deletions
This file was deleted.

stack-shell.nix

Lines changed: 0 additions & 1 deletion
This file was deleted.

stack.yaml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# resolver: ./custom-snapshot.yaml
2020
# resolver: https://example.com/snapshots/2018-01-01.yaml
2121

22-
resolver: https://raw.githubusercontent.com/input-output-hk/cardano-prelude/7f8544ae9e162b6664f07093227edb148f1c8a5b/snapshot.yaml
22+
resolver: https://raw.githubusercontent.com/input-output-hk/cardano-prelude/a136c4242b9c9f6124b811329bc8ccdfd86c514e/snapshot.yaml
2323

2424
# User packages to be built.
2525
# Various formats can be used as shown in the example below.
@@ -40,10 +40,11 @@ packages:
4040
# using the same syntax as the packages field.
4141
# (e.g., acme-missiles-0.3)
4242
extra-deps:
43-
- quickcheck-state-machine-0.6.0 # Used a specific dependency, new release.
43+
- quickcheck-state-machine-0.6.0 # Used a specific dependency, new release.
44+
- pretty-show-1.9.5 # Used for quickcheck-state-machine.
4445

4546
- git: https://github.com/input-output-hk/cardano-prelude
46-
commit: 2256fd727c5f92e6218afdcf8cddf6e01c4a9dcd
47+
commit: 892661cc3951e0d3a385c49c4563b2ae1cf9a4c2
4748
subdirs:
4849
- .
4950
- test
@@ -54,7 +55,6 @@ extra-deps:
5455
- contra-tracer
5556
- iohk-monitoring
5657

57-
5858
# Extracted from cardano-sl since it's quite useful
5959
- git: https://github.com/input-output-hk/cardano-sl-x509
6060
commit: 71115d199368f1cc969a4936a856808539063253
@@ -70,10 +70,6 @@ extra-deps:
7070
- prometheus-2.1.1
7171
- containers-0.5.11.0
7272

73-
- process-1.6.5.0
74-
75-
- transformers-0.5.6.2
76-
7773
# Override default flag values for local packages and extra-deps
7874
# flags: {}
7975

@@ -101,4 +97,4 @@ extra-deps:
10197
nix:
10298
enable: true
10399
pure: false
104-
shell-file: stack-shell.nix
100+
shell-file: shell.nix

0 commit comments

Comments
 (0)