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

Release tracking PR: v0.101.0+0.21.2 #77

Merged
merged 1 commit into from
Jan 10, 2024

Conversation

tcharding
Copy link
Member

@tcharding tcharding commented Dec 14, 2023

Add changelog and bump the version.

@tcharding tcharding changed the title Vendor Bitcoin Core v0.21.2 Release tracking PR: v0.101.0+0.21.2 Vendor Bitcoin Core v0.21.2 Dec 14, 2023
@tcharding tcharding changed the title Release tracking PR: v0.101.0+0.21.2 Vendor Bitcoin Core v0.21.2 Release tracking PR: v0.101.0+0.21.2 Dec 14, 2023
@tcharding
Copy link
Member Author

tcharding commented Dec 14, 2023

There was a typo in yesterdays tag, I've fixed it up, delete the wrong one and pushed the new one, you will see the wrong one locally still @apoelstra. Please review this PR at the same time as #78.

@tcharding
Copy link
Member Author

phew! I woke up in the night and remembered I hadn't built rust-bitcoin with this version. Now done, and for the v0.101.1+0.21-final PR too.

@apoelstra
Copy link
Member

The tag you pushed appeared to be unsigned so I replaced it with a signed one :). It should be correct now.

@apoelstra
Copy link
Member

As before, can you separate the "bump version and release" commit into its own PR?

@tcharding
Copy link
Member Author

Oh yep, can do. Can you tell me what your scripts don't like about it when its together in a single PR, perhaps then I will internalise it and remember for future.

@tcharding tcharding mentioned this pull request Dec 17, 2023
@tcharding tcharding marked this pull request as draft December 17, 2023 20:35
@tcharding tcharding mentioned this pull request Dec 17, 2023
@apoelstra
Copy link
Member

@tcharding it causes my lockfiles to change partway through the PR. But the lockfiles are provided externally and I can't specify different ones for different commits (my scripts automatically compute the set of commits per PR, I don't know them and can't attach metadata to them).

An alternate solution would be to pull the lockfiles into the crate, like we do with rust-bitcoin and rust-secp.

@tcharding
Copy link
Member Author

An alternate solution would be to pull the lockfiles into the crate, like we do with rust-bitcoin and rust-secp.

So for those you just run CI with recent and minimal lockfiles? I can do that same set up here if it helps.

@apoelstra
Copy link
Member

So for those you just run CI with recent and minimal lockfiles? I can do that same set up here if it helps.

Yeah. That'd be great.

apoelstra added a commit that referenced this pull request Jan 8, 2024
12d7ec3 Fix Bitcoin Core 0.21.2 upgrade (Tobin C. Harding)
a4f30ef Vendor Bitcoin Core v0.21.2 (Tobin C. Harding)
8b3d23f Update README about vendoring (Tobin C. Harding)
3ca86b9 Remove the depend directory (Tobin C. Harding)
619611e Add Bitcoin Core vendor script (Tobin C. Harding)

Pull request description:

  This is #77 without the version bump patch.

  Upgrade to a new way of vendoring Core and vendor version 0.21.2 - note please this will be directly followed by an upgrade to 0.21-final. Done separately to proof out the workflow of such an upgrade.

ACKs for top commit:
  apoelstra:
    ACK 12d7ec3

Tree-SHA512: f708b4bda1a209afe7552ec0e691ed104847d4a4a5fae6cd13f2da8f3a205c0a652ced8883900b9ce312cb8f4f39f77f0abbdf3372016c5af7aeddc3e33984ba
@tcharding
Copy link
Member Author

Next step is #81 and then this one - BOOM.

@tcharding tcharding marked this pull request as ready for review January 10, 2024 05:53
@tcharding
Copy link
Member Author

Please ack, merge, tag, publish, and party.

Add a changlog entry and bump the version. There are no patches other
than vendoring new Core vension since the 0.100.0+0.20.2 release.
Copy link
Member

@apoelstra apoelstra left a comment

Choose a reason for hiding this comment

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

ACK 119126f

@apoelstra apoelstra merged commit 43b47e3 into rust-bitcoin:master Jan 10, 2024
6 checks passed
@apoelstra
Copy link
Member

Tagged and published.

@tcharding tcharding deleted the v0.101.0+0.21.2 branch January 11, 2024 02:55
apoelstra added a commit that referenced this pull request Jan 12, 2024
ae41548 Vendor Bitcoin Core v0.21-final (Tobin C. Harding)

Pull request description:

  Vendor the final release of the 0.21 series of Bitcoin Core.

  Should be trivial to review, this PR is intentionally done separate to #77 so we can release both versions as a test run of how we will later do LTS releases as Core releases updated versions.

  Also, before we switched the version format we could not use the `-final` because it violated semver rules, now `0.101.1+0.21-final` builds just fine.

ACKs for top commit:
  apoelstra:
    ACK ae41548

Tree-SHA512: f0edb7acf41c0796808f31c1e657dd310167966b4d68d684683141ecdd9afa8c0c495e7f51a946cf9f49cbdea1c2f6d6bead679a00b8486447d812ee5e8cda40
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.

2 participants