Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update dependencies #2274

Merged
merged 2 commits into from
Jan 19, 2021
Merged

Update dependencies #2274

merged 2 commits into from
Jan 19, 2021

Conversation

mrBliss
Copy link
Contributor

@mrBliss mrBliss commented Jan 12, 2021

@mrBliss mrBliss requested review from coot and deepfire January 12, 2021 11:30
mrBliss
mrBliss commented Jan 12, 2021
View reviewed changes
cardano-node/src/Cardano/Tracing/Tracers.hs Outdated
@@ -857,6 +858,7 @@ nodeToNodeTracers' trSel verb tr =
, NodeToNode.tBlockFetchTracer = tracerOnOff (traceBlockFetchProtocol trSel) verb "BlockFetchProtocol" tr
, NodeToNode.tBlockFetchSerialisedTracer = showOnOff (traceBlockFetchProtocolSerialised trSel) "BlockFetchProtocolSerialised" tr
, NodeToNode.tTxSubmissionTracer = tracerOnOff (traceTxSubmissionProtocol trSel) verb "TxSubmissionProtocol" tr
, NodeToNode.tTxSubmission2Tracer = nullTracer -- TODO @coot: tracerOnOff (traceTxSubmission2Protocol trSel) verb "TxSubmission2Protocol" tr
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Draft because this still needs to be done by somebody from the network team. cc @coot.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @coot! Shall I squash before merging?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done, I pushed two commits to this branch.

@mrBliss mrBliss force-pushed the mrBliss/update-dependencies-20210112 branch from 6352143 to 893bb17 Compare January 12, 2021 11:34
deepfire
deepfire approved these changes Jan 12, 2021
View reviewed changes
Copy link
Contributor

@deepfire deepfire left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, ❤️

@mrBliss mrBliss marked this pull request as ready for review January 13, 2021 09:17
@coot
Copy link
Contributor

coot commented Jan 13, 2021

I found a typo in my commit, I am going to git push --force.

@coot coot force-pushed the mrBliss/update-dependencies-20210112 branch from 60cbace to bdc861c Compare January 13, 2021 09:23
@mrBliss
Copy link
Contributor Author

mrBliss commented Jan 13, 2021

I found a typo in my commit, I am going to git push --force.

Go ahead. You can even squash everything in my first commit.

@coot coot force-pushed the mrBliss/update-dependencies-20210112 branch from bdc861c to 0e54113 Compare January 13, 2021 09:25
@coot
Copy link
Contributor

coot commented Jan 13, 2021

Go ahead. You can even squash everything in my first commit.

Done

@coot
Copy link
Contributor

coot commented Jan 13, 2021

The windows build fails:

cabal.exe: Could not resolve dependencies:
[__0] trying: byron-spec-chain-0.1.0.0 (user goal)
[__1] trying: hedgehog-1.0.4 (dependency of byron-spec-chain)
[__2] trying: cardano-api-1.24.2 (user goal)
[__3] rejecting: cardano-api:!test (constraint from config file, command line
flag, or user target requires opposite flag selection)
[__3] trying: cardano-api:*test
[__4] next goal: tasty-hedgehog (dependency of cardano-api *test)
[__4] rejecting: tasty-hedgehog-1.0.0.2 (conflict: hedgehog==1.0.4,
tasty-hedgehog => hedgehog>=1.0.2 && <1.0.4)
[__4] skipping: tasty-hedgehog-1.0.0.1, tasty-hedgehog-1.0.0.0,
tasty-hedgehog-0.2.0.0, tasty-hedgehog-0.1.0.2, tasty-hedgehog-0.1.0.1,
tasty-hedgehog-0.1.0.0 (has the same characteristics that caused the previous
version to fail: excludes 'hedgehog' version 1.0.4)
[__4] fail (backjumping, conflict set: cardano-api, hedgehog, tasty-hedgehog,
cardano-api:test)
Backjump limit reached (currently 4000, change with --max-backjumps or try to
run with --reorder-goals).

tasty-hedgehog-1.0.0.2 is needed to complete this plan, it was published on 16.12.2020, updating index-state might help as its a few days older:

'hackage.haskell.org'! Falling back to older state (2020-12-10T21:37:13Z).

@erikd erikd force-pushed the mrBliss/update-dependencies-20210112 branch 8 times, most recently from a671a72 to 7373b12 Compare January 18, 2021 00:48
@erikd erikd mentioned this pull request Jan 18, 2021
Closed
@erikd erikd force-pushed the mrBliss/update-dependencies-20210112 branch 3 times, most recently from 995f40d to 3897f02 Compare January 18, 2021 06:54
@erikd erikd force-pushed the mrBliss/update-dependencies-20210112 branch 2 times, most recently from 53d1694 to 4b332f5 Compare January 18, 2021 09:24
@hamishmack
Copy link
Contributor

Added the hydra-dont-build label as the eval keeps running out of memory. We think #2285 will fix the issue with too many jobs being included.

@mrBliss @erikd
Update dependencies
18b99fa 
Note that this does not incorporate the latest changes in cardano-ledger-specs.

Notable changes:
* IntersectMBO/ouroboros-network#2807
* IntersectMBO/ouroboros-network#2811
* IntersectMBO/ouroboros-network#2832

network tracers: moved ToObject TxSubmission instance

network tracers: added ToObjcet TxSubmission2 instance

Update cabal.project index-state value
@erikd erikd force-pushed the mrBliss/update-dependencies-20210112 branch from 4b332f5 to 6919d6a Compare January 18, 2021 21:51
@erikd erikd mentioned this pull request Jan 18, 2021
Closed
@erikd erikd force-pushed the mrBliss/update-dependencies-20210112 branch 3 times, most recently from 4b6e8e0 to b823ddd Compare January 19, 2021 05:31
@erikd erikd force-pushed the mrBliss/update-dependencies-20210112 branch from b823ddd to 5277df0 Compare January 19, 2021 06:17
@kderme
Copy link
Contributor

kderme commented Jan 19, 2021 •
edited
Loading

Could we have this pr in the update? IntersectMBO/ouroboros-network#2875
Or since ci is now green I can do a follow update pr

@kderme
Copy link
Contributor

kderme commented Jan 19, 2021

bors merge

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jan 19, 2021

Build succeeded:

@iohk-bors iohk-bors bot merged commit 8ad47ce into master Jan 19, 2021
@erikd erikd deleted the mrBliss/update-dependencies-20210112 branch April 16, 2021 07:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@deepfire deepfire deepfire approved these changes

@erikd erikd erikd approved these changes

@coot coot Awaiting requested review from coot

@dcoutts dcoutts Awaiting requested review from dcoutts

@intricate intricate Awaiting requested review from intricate

@Jimbo4350 Jimbo4350 Awaiting requested review from Jimbo4350

@newhoggy newhoggy Awaiting requested review from newhoggy

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@mrBliss @coot @hamishmack @kderme @erikd @deepfire @sevanspowell