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 the MSRV #719

Merged
merged 3 commits into from
Aug 7, 2024
Merged

Bump the MSRV #719

merged 3 commits into from
Aug 7, 2024

Conversation

tcharding
Copy link
Member

As we have done in rust-bitcoin bump the MSVR to Rust 1.63.0

Also, run the MSRV CI job with both lockfiles (which are currently different).

@storopoli
Copy link
Contributor

As you did with other bumps, you forget to update the README 😂

@tcharding
Copy link
Member Author

Damn, I have a grep alias that ignores md files - I have to remember not to use it when doing MSRV bumps. Thanks man.

Copy link
Contributor

@storopoli storopoli left a comment

Choose a reason for hiding this comment

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

ACK add2fc3

@tcharding
Copy link
Member Author

Force push is just a change to the docs on the MSRV job, sorry to require re-ack @storopoli (found while rebaseing #694).

@apoelstra
Copy link
Member

Could you add a commit to the start of this which bumps the honggfuzz dep in both lockfiles?

It doesn't really have anything to do with this PR but it's a "toolchain update" and it'd simplify my local CI runs.

@tcharding tcharding force-pushed the 08-06-bump-msrv branch 2 times, most recently from c1c7587 to 3916522 Compare August 6, 2024 00:47
@tcharding
Copy link
Member Author

I'm not sure why the hongfuzz change causes just update-lock-files to do so much. (Running it on master does not change the lock files.)

Copy link
Contributor

@storopoli storopoli left a comment

Choose a reason for hiding this comment

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

ACK 3916522

@apoelstra
Copy link
Member

6a56d37 seems weird, and it bumps the versions of stuff in Cargo-minimal.lock that should continue to work. I'd prefer you just updated honggfuzz and nothing else, using the normal cargo update -p honggfuzz --precise 0.5.56 mechanism.

And the reason why is that honggfuzz is both a dependency and a binary that the developer needs to have installed on their system, and the versions of these two things need to match exactly, and my CI scripts have the latest version since we updated rust-bitcoin and others. And also the latest version fixes a bug with memcpy which was messing up my fuzzing in Simplicity and likely messing up fuzzing here.

@tcharding
Copy link
Member Author

Ah I see, thanks for the explanation. Will re-spin

A recent patch version of `hongfuzz` fixed a bug with `memcpy`, we
likely do not want users using the old version.

Upgrade by first pinning then by patching the manifest.
As we have done in `rust-bitcoin` bump the MSVR to Rust 1.63.0

While we are at it and so that the commit lints cleanly fix a couple of
new clippy warnings:

- Remove redundant import of `TryFrom`
- Use `then_some` combinator
Currently we are not running the MSRV job with both lock files, we
should. Note also that the lock files are different, testing older
versions of `hashes` and `internals` - this is because of the range
dependency in `secp` (I think).
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 c95b411 successfully ran local tests; glad I got #712 in first so I could do the release!

@apoelstra apoelstra merged commit a6e897f into rust-bitcoin:master Aug 7, 2024
14 checks passed
@tcharding
Copy link
Member Author

Want me to do a release PR?

@apoelstra
Copy link
Member

No, I just released 12.2 right before merging this.

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.

3 participants