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.

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

Update ouroboros-network and cardano-ledger dependencies #4608

Merged
merged 4 commits into from
Dec 7, 2022

Conversation

Soupstraw
Copy link
Contributor

@Soupstraw Soupstraw commented Nov 3, 2022

This PR updates ouroboros-network and cardano-ledger dependencies.

This bumps cardano-ledger to 0.1.1.1, which is IntersectMBO/cardano-ledger#3080. This in turn is the release/1.1.x branch + heapword split compatibility introduced in cardano-base, which is in CHaP.

It also bumps ouroboros-network to a38f898a, which is 45 commits ahead of the old c764553 pin.
This is one commit ahead of what IntersectMBO/ouroboros-network#3933 (on ouroboros-network/master), that made network compatible with IntersectMBO/cardano-ledger#2901

@Soupstraw Soupstraw marked this pull request as ready for review November 7, 2022 10:29
@Soupstraw Soupstraw force-pushed the jj/update-ledger branch 2 times, most recently from a047c9a to ddb8704 Compare November 7, 2022 10:42
@Soupstraw Soupstraw marked this pull request as draft November 7, 2022 10:48
@Soupstraw Soupstraw marked this pull request as ready for review November 7, 2022 10:50
@Soupstraw Soupstraw mentioned this pull request Nov 7, 2022
@angerman
Copy link
Contributor

angerman commented Nov 7, 2022

Thanks! This is great @Soupstraw!

I hope we can cut ledger and network releases for this. Drop the source-repository-packages from this, and merge :-)

Copy link
Contributor

@coot coot left a comment

Choose a reason for hiding this comment

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

LGTM

cardano-node/src/Cardano/Node/Run.hs Outdated Show resolved Hide resolved
cabal.project Outdated Show resolved Hide resolved
@erikd
Copy link
Contributor

erikd commented Dec 5, 2022

Fixed compile errors, squashed commits and forced pushed.

@angerman
Copy link
Contributor

angerman commented Dec 6, 2022

bors try

@angerman
Copy link
Contributor

angerman commented Dec 6, 2022

bors retry

Soupstraw and others added 4 commits December 6, 2022 15:02
Co-authored-by: Samuel Leathers <[email protected]>
Co-authored-by: Moritz Angermann <[email protected]>
Co-authored-by: Marcin Szamotulski <[email protected]>
* ported from release/1.35
* also fixes typo in a changelog
@angerman
Copy link
Contributor

angerman commented Dec 6, 2022

bors try

iohk-bors bot added a commit that referenced this pull request Dec 6, 2022
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Dec 7, 2022

try

Timed out.

@angerman
Copy link
Contributor

angerman commented Dec 7, 2022

bors retry

iohk-bors bot added a commit that referenced this pull request Dec 7, 2022
@angerman
Copy link
Contributor

angerman commented Dec 7, 2022

bors retry

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Dec 7, 2022

try

Already running a review

@angerman
Copy link
Contributor

angerman commented Dec 7, 2022

bors try

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Dec 7, 2022

try

Already running a review

@angerman
Copy link
Contributor

angerman commented Dec 7, 2022

bors r+

iohk-bors bot added a commit that referenced this pull request Dec 7, 2022
4608: Update ouroboros-network and cardano-ledger dependencies r=angerman a=Soupstraw

This PR updates ouroboros-network and cardano-ledger dependencies. 

This bumps `cardano-ledger` to `0.1.1.1`, which is IntersectMBO/cardano-ledger#3080. This in turn is the `release/1.1.x` branch + heapword split compatibility introduced in `cardano-base`, which is in CHaP.

It also bumps ouroboros-network to [a38f898a](https://github.com/input-output-hk/ouroboros-network/commits/a38f898a3740925ccaa0617fa870ca7054a485a6), which is 45 commits ahead of the old [c764553](https://github.com/input-output-hk/ouroboros-network/commits/c764553561bed8978d2c6753d1608dc65449617a) pin.
This is one commit ahead of what IntersectMBO/ouroboros-network#3933 (on ouroboros-network/master), that made network compatible with IntersectMBO/cardano-ledger#2901

Co-authored-by: Joosep Jääger <[email protected]>
Co-authored-by: Samuel Leathers <[email protected]>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Dec 7, 2022

try

Timed out.

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Dec 7, 2022

Timed out.

@Soupstraw
Copy link
Contributor Author

bors try

iohk-bors bot added a commit that referenced this pull request Dec 7, 2022
@Jimbo4350 Jimbo4350 merged commit 7d3633e into master Dec 7, 2022
@iohk-bors iohk-bors bot deleted the jj/update-ledger branch December 7, 2022 14:10
@Jimbo4350
Copy link
Contributor

Apparently bors does not get the cicero results. Devops has to fix this before we can use bors to merge PRs.

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Dec 7, 2022

try

Timed out.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants