Skip to content

Backport #1820 and bump minor version 0.30.2#2196

Merged
apoelstra merged 2 commits intorust-bitcoin:0.30.xfrom
tcharding:11-16-backport-pow-shifts
Nov 16, 2023
Merged

Backport #1820 and bump minor version 0.30.2#2196
apoelstra merged 2 commits intorust-bitcoin:0.30.xfrom
tcharding:11-16-backport-pow-shifts

Conversation

@tcharding
Copy link
Copy Markdown
Member

Patch one backports #1820, I believe this is all that is needed for LDK to be able to upgrade to rust-bitcoin v0.30.

Context:

Patch 2 adds a changelog entry and bumps the minor version.

wpaulino and others added 2 commits November 16, 2023 11:12
Once `U256` was made private, we lost the ability to check whether a
valid difficulty transition was made in the chain, since `Target`
no longer exposes any arithmetic operations.
We just backported PR rust-bitcoin#1820, add a changelog entry and bump the crate
version.
@tcharding
Copy link
Copy Markdown
Member Author

tcharding commented Nov 16, 2023

The CI fails are lint "warnings" and pinning issues, neither of which should not be backported, right?

Copy link
Copy Markdown
Collaborator

@Kixunil Kixunil left a comment

Choose a reason for hiding this comment

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

ACK ba99aa4

@Kixunil
Copy link
Copy Markdown
Collaborator

Kixunil commented Nov 16, 2023

I don't think it matters if we "backport" lint fixes since they're in hashes anyway.

@apoelstra
Copy link
Copy Markdown
Member

The CI fails are lint "warnings" and pinning issues, neither of which should not be backported, right?

Correct. CI will never pass on backports because the Rust ecosystem is too big a mess to have a working pipeline for more than a couple weeks without constant babysitting and patching.

@apoelstra
Copy link
Copy Markdown
Member

...though having said that, part of the reason we have lockfiles in the repo is to prevent "pinning issues" from cropping up.

@apoelstra apoelstra merged commit 4b6b55f into rust-bitcoin:0.30.x Nov 16, 2023
@apoelstra
Copy link
Copy Markdown
Member

Tagged and published.

There was already a 0.30.2 tag but as near as I can tell it was some sort of experiment with the new release script, so I just overwrote it.

@Kixunil
Copy link
Copy Markdown
Collaborator

Kixunil commented Nov 17, 2023

...though having said that, part of the reason we have lockfiles in the repo is to prevent "pinning issues" from cropping up

IIUC this one stems from using nightly. I suggest we pin nightly for backports but let it run on master. Or even use cron job on master to find new issues and update pins but pin it in PRs as well so that people don't get new lints in unrelated code.

@apoelstra
Copy link
Copy Markdown
Member

IIUC this one stems from using nightly. I suggest we pin nightly for backports but let it run on master.

Yeah, this sounds like a great idea. Maybe on every release we should create a branch and add a "pin nightly" patch to it, as part of the release process?

Or we could just wait until we have to do a backport, and create the branch then.

@Kixunil
Copy link
Copy Markdown
Collaborator

Kixunil commented Nov 17, 2023

I was thinking of having a bot that tests master with latest nightly when the nightly is released - on success update the pin (and nothing else - a trivial one-line commit) on error notify us and we manually resolve it whenever it works for us.

@apoelstra
Copy link
Copy Markdown
Member

@Kixunil oh, nice, that would be awesome.

For a few weeks we had @realeinherjar doing a bunch of scripting magic here. I'm not sure if he'd be willing to give this a shot or if he's moved on or what.

@realeinherjar
Copy link
Copy Markdown
Contributor

This is what https://github.com/rust-bitcoin/rust-bitcoin.github.io/blob/bcdce9f961fba200a18352fcd45cc49086c5c3df/.github/workflows/test.yml is doing in the rust-bitcoin.org website.

Let me see if I got this straight: We need a "cron" CI job that tests the master branch with the latest Rust nightly release. If errors, then either a notification or open an issue?

If yes, @Kixunil do you want to work on that, or can I do it?

@Kixunil
Copy link
Copy Markdown
Collaborator

Kixunil commented Nov 18, 2023

@realeinherjar yes and on success commit to master the nightly version. Run the job every day after nightly is released (there's a set time of release, I don't remember plus add a buffer of an hour or two)

Go ahead, I have other things to do now.

@tcharding tcharding deleted the 11-16-backport-pow-shifts branch December 19, 2023 22:22
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.

5 participants