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

Bump to use latest released cardano-base and cardano-prelude packages #3080

Merged
merged 4 commits into from
Nov 9, 2022

Conversation

michaelpj
Copy link
Contributor

The release branch is using an unreleased commit of cardano-base which contains the SECP primitives but is before the heapwords split. This makes it incompatible with either of the released versions:

  • The previous version doesn't have the SECP primitives
  • The next version has the heapwords split

In order to make the release branch usable via CHaP, I think the simplest thing is to backport the changes for the newer cardano-base packages, i.e. the heapwords split. This is a bit tedious but not too bad overall.

Afterwards I'll release another version from this branch.

@michaelpj
Copy link
Contributor Author

Hmm, I'm just going to double check this works, do not merge for now.

@JaredCorduan
Copy link
Contributor

thank you @michaelpj !

@michaelpj michaelpj force-pushed the mpj/release-1.1-dep-bump branch from 812ae83 to 7ffc276 Compare October 13, 2022 14:36
The release branch is using an unreleased commit of `cardano-base` which
contains the SECP primitives but is before the `heapwords` split. This
makes it incompatible with either of the released versions:
- The previous version doesn't have the SECP primitives
- The next version has the heapwords split

In order to make the release branch usable via CHaP, I think the
simplest thing is to backport the changes for the newer `cardano-base`
packages, i.e. the `heapwords` split. This is a bit tedious but not too
bad overall.

Afterwards I'll release another version from this branch.
@michaelpj michaelpj force-pushed the mpj/release-1.1-dep-bump branch from 7ffc276 to cb29b03 Compare October 13, 2022 14:46
@michaelpj michaelpj closed this Oct 13, 2022
@angerman
Copy link
Contributor

angerman commented Nov 7, 2022

@michaelpj why did you end up closing this PR and not pursuing it to be merged into 1.1.x?

@michaelpj
Copy link
Contributor Author

Because I was told that 1.1.x was not a real release and anyway I was trying to fix [email protected] which was using 1.0.x not 1.1.x so I was doing completely the wrong thing anyway.

@angerman angerman reopened this Nov 8, 2022
@angerman
Copy link
Contributor

angerman commented Nov 8, 2022

We'll use this as the basis for the 1.1.1 release, for use in IntersectMBO/cardano-node#4608.

Todo:

  • CI green
  • bump version
  • release 1.1.1 to CHaP

1.0.0 -> 1.1.1
1.3.0 -> 1.4.1
@angerman
Copy link
Contributor

angerman commented Nov 8, 2022

Sigh, so this is green, except for a busted cicero call.

I think we might have a few over-specified constraints here.
Copy link
Contributor

@Soupstraw Soupstraw left a comment

Choose a reason for hiding this comment

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

LGTM

@Soupstraw Soupstraw merged commit 99b8c5d into release/1.1.x Nov 9, 2022
@iohk-bors iohk-bors bot deleted the mpj/release-1.1-dep-bump branch November 9, 2022 13:47
iohk-bors bot added a commit to IntersectMBO/cardano-node 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]>
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.

4 participants