Skip to content

Commit

Permalink
Upgrade to GHC 8.6 (#518)
Browse files Browse the repository at this point in the history
* Use new pact nix infrastructure and GHC 8.6

* Bump these version bound

* Add semialign dependency

* Bump pact

* New version of pact requires new hedgehog-fn

* Fix shell.nix

* Change binary paths

* Bump these lower bound
  • Loading branch information
mightybyte authored and fosskers committed Oct 10, 2019
1 parent 30c4b1b commit 5e6312e
Show file tree
Hide file tree
Showing 6 changed files with 163 additions and 397 deletions.
6 changes: 3 additions & 3 deletions .gitlab-ci.yml
Expand Up @@ -53,7 +53,7 @@ nix-linux:
- cat .vcs-info
- nix-build --option extra-sandbox-paths '/etc/protocols /etc/services'
- nix-shell --run "echo Done with shell test"
- ./result/ghc/chainweb/bin/chainweb-node --version
- ./result/bin/chainweb-node --version
# - nix-build --option extra-sandbox-paths '/etc/protocols /etc/services' -A ghc.chainweb.doc

# NOTE: If we want artifacts to inclue code coverage reports, we have to pass
Expand Down Expand Up @@ -83,7 +83,7 @@ slow-tests:
script:
- echo This is a master slow test run.
- nix-build --option extra-sandbox-paths '/etc/protocols /etc/services'
- result/ghc/chainweb/bin/cwtool slow-tests +RTS -N4
- result/bin/cwtool slow-tests +RTS -N4

# pages:
# stage: deploy
Expand All @@ -107,4 +107,4 @@ nightly-nix:

# It probably makes sense to run coverage nightly
- nix-build --option extra-sandbox-paths '/etc/protocols /etc/services' --arg runCoverage true
- result/ghc/chainweb/bin/cwtool slow-tests +RTS -N4
- result/bin/cwtool slow-tests +RTS -N4
6 changes: 4 additions & 2 deletions chainweb.cabal
Expand Up @@ -331,6 +331,7 @@ library
, resourcet >= 1.2
, safeio >= 0.0
, safe-exceptions >= 0.1
, semialign >= 1
, servant >= 0.14
, servant-client >= 0.14
, servant-client-core >= 0.14
Expand All @@ -348,7 +349,7 @@ library
, swagger2 >= 2.2
, temporary >= 1.3
, text >= 1.2
, these >= 0.7 && < 1
, these >= 1 && < 1.1
, time >= 1.8
, tls >=1.5
, token-bucket >= 0.1
Expand Down Expand Up @@ -466,6 +467,7 @@ test-suite chainweb-tests
, resourcet >= 1.2
, retry >= 0.7
, scheduler >= 1.4
, semialign >= 1
, servant >= 0.14
, servant-client >= 0.14
, servant-client-core >= 0.14
Expand All @@ -481,7 +483,7 @@ test-suite chainweb-tests
, tasty-quickcheck >= 0.9
, temporary >= 1.3
, text >=1.2
, these >= 0.7 && < 1
, these >= 1 && < 1.1
, time >= 1.8
, transformers >= 0.5
, unordered-containers >= 0.2
Expand Down

0 comments on commit 5e6312e

Please sign in to comment.