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

Integrate in preparation for cardano-node release 10.2.0 #986

Merged
merged 9 commits into from
Jan 15, 2025
Merged

Integrate in preparation for cardano-node release 10.2.0 #986

merged 9 commits into from
Jan 15, 2025
+62 −74

Conversation

neilmayhew
Copy link
Contributor

@neilmayhew neilmayhew commented Nov 29, 2024 •
edited by carbolymer
Loading

Changelog

- description: |
    Integrate `plutus`, `cardano-ledger`, `ouroboros-network`, `ouroboros-consensus`, `cardano-api-10.6.0.0`
  type:
   - breaking
   - feature

Context

See IntersectMBO/cardano-node#6040 for overall progress and links to PRs in other repos

Checklist

  • Commit sequence broadly makes sense and commits have useful messages
  • New tests are added if needed and existing tests are updated. See Running tests for more details
  • Self-reviewed the diff

@neilmayhew neilmayhew mentioned this pull request Nov 29, 2024
Open
15 tasks
@neilmayhew neilmayhew force-pushed the neilmayhew/release-srp branch 2 times, most recently from 3f2fc4c to e9d2b59 Compare December 10, 2024 05:57
@neilmayhew neilmayhew force-pushed the neilmayhew/release-srp branch 3 times, most recently from 97bd77f to 17ca777 Compare December 19, 2024 05:45
@neilmayhew neilmayhew force-pushed the neilmayhew/release-srp branch from 17ca777 to e2940ca Compare December 20, 2024 05:16
This was referenced Jan 7, 2025
Closed
Closed
@neilmayhew neilmayhew force-pushed the neilmayhew/release-srp branch from 99cfa1b to c79ad06 Compare January 8, 2025 22:24
@neilmayhew neilmayhew marked this pull request as ready for review January 8, 2025 22:25
@neilmayhew neilmayhew force-pushed the neilmayhew/release-srp branch 3 times, most recently from c9b0dd1 to 83c0039 Compare January 8, 2025 23:34
carbolymer
carbolymer reviewed Jan 9, 2025
View reviewed changes
Copy link
Contributor

@carbolymer carbolymer left a comment

Choose a reason for hiding this comment

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

LGTM overall. Can you clean up git commit history?

cardano-cli/cardano-cli.cabal Outdated Show resolved Hide resolved
cardano-cli/cardano-cli.cabal Outdated Show resolved Hide resolved
cardano-cli/cardano-cli.cabal Outdated Show resolved Hide resolved
@neilmayhew neilmayhew force-pushed the neilmayhew/release-srp branch from 83c0039 to abb632c Compare January 9, 2025 14:08
@neilmayhew
Copy link
Contributor Author

I'll take the srp out and update the CHaP index when cardano-api is released. What other changes to the commit history would you like to see?

@crocodile-dentist crocodile-dentist mentioned this pull request Jan 13, 2025
Merged
3 tasks
@carbolymer carbolymer force-pushed the neilmayhew/release-srp branch from 0aed335 to 224d71a Compare January 14, 2025 16:52
@neilmayhew neilmayhew mentioned this pull request Jan 15, 2025
Open
3 tasks
@neilmayhew neilmayhew force-pushed the neilmayhew/release-srp branch from 20bedf8 to f919e9e Compare January 15, 2025 01:01
@carbolymer carbolymer force-pushed the neilmayhew/release-srp branch from 318fc03 to 2b86066 Compare January 15, 2025 10:40
@carbolymer
Copy link
Contributor

I have removed #972 from this PR and simply disabled the feature. It will be merged as a separate PR.

@carbolymer carbolymer enabled auto-merge January 15, 2025 10:43
@carbolymer carbolymer disabled auto-merge January 15, 2025 12:29
@carbolymer carbolymer merged commit eecd898 into master Jan 15, 2025
25 of 27 checks passed
@carbolymer carbolymer deleted the neilmayhew/release-srp branch January 15, 2025 12:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@carbolymer carbolymer carbolymer approved these changes

@Jimbo4350 Jimbo4350 Awaiting requested review from Jimbo4350 Jimbo4350 is a code owner

@newhoggy newhoggy Awaiting requested review from newhoggy newhoggy is a code owner

@smelc smelc Awaiting requested review from smelc smelc is a code owner

@palas palas Awaiting requested review from palas palas is a code owner

@kevinhammond kevinhammond Awaiting requested review from kevinhammond kevinhammond is a code owner

@disassembler disassembler Awaiting requested review from disassembler disassembler is a code owner

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

Successfully merging this pull request may close these issues.
3 participants
@neilmayhew @carbolymer @coot