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

Bump deps and update to changes in them #59

Merged
merged 9 commits into from
Oct 30, 2019
Merged

Conversation

deepfire
Copy link
Contributor

@deepfire deepfire commented Oct 25, 2019

This:

  1. Bumps dependencies to the version used in cardano-node,
  2. Uses a bumped cardano-sl with Single-machine multi-node mixed cluster CI prerequisites cardano-sl#4247
  3. Updates to changes in cardano-ledger and ouroboros-network
  4. Adds new dependencies to facilitate the above.

@deepfire deepfire changed the title Bump deps and fix Bump deps and update to cardano-sl changes Oct 25, 2019
@deepfire deepfire added the WIP label Oct 25, 2019
@deepfire deepfire removed the WIP label Oct 28, 2019
@deepfire deepfire force-pushed the serge/bump-deps branch 3 times, most recently from ef8ae5c to 3f35ebe Compare October 29, 2019 21:00
@deepfire deepfire force-pushed the serge/bump-deps branch 2 times, most recently from fc9f41f to d04a120 Compare October 30, 2019 10:18
@deepfire deepfire changed the title Bump deps and update to cardano-sl changes Bump deps and update to changes in them Oct 30, 2019
@deepfire deepfire requested a review from mrBliss October 30, 2019 13:42
Copy link
Contributor

@mrBliss mrBliss left a comment

Choose a reason for hiding this comment

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

Looks good to me.

I would prefer to rebase this PR so that we don't have a commit introducing the extra dependencies and then another removing them again 🙂. I don't think this adds much to the Git history of cardano-byron-proxy.

BTW, do we need all the dependency pins? For example, all these test subdirs, do we really need them for this repository? I removed some of them in ouroboros-network by trial & error.

Comment on lines 98 to 102
source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: d3e71facd53da4a2c72e4947f551ddeac45fba41
tag: 2441f25ee5a2da0fbf008f3e9a1b1fd4e57f1de3
subdir: ouroboros-network-testing
Copy link
Contributor

Choose a reason for hiding this comment

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

Unrelated to this PR: do we actually need ouroboros-network-testing? It only exports Ouroboros.Network.Testing.QuickCheck and Ouroboros.Network.Testing.Serialsie.

@deepfire
Copy link
Contributor Author

@mrBliss, did the cleanup.

@deepfire
Copy link
Contributor Author

bors r+

iohk-bors bot added a commit that referenced this pull request Oct 30, 2019
59: Bump deps and update to changes in them r=deepfire a=deepfire

This:

1. Bumps dependencies to the version used in `cardano-node`,
2. Uses a bumped `cardano-sl` with input-output-hk/cardano-sl#4247
3. Updates to changes in `cardano-ledger` and `ouroboros-network`
4. Adds new dependencies to facilitate the above.

Co-authored-by: Kosyrev Serge <[email protected]>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Oct 30, 2019

@iohk-bors iohk-bors bot merged commit 9650e34 into master Oct 30, 2019
@iohk-bors iohk-bors bot deleted the serge/bump-deps branch October 30, 2019 20:47
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants