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

Fix CI #576

Merged
merged 1 commit into from
Jan 30, 2023
Merged

Fix CI #576

merged 1 commit into from
Jan 30, 2023

Conversation

tcharding
Copy link
Member

@tcharding tcharding commented Jan 28, 2023

Currently CI is broken because we use the latest version of rustfmt and clippy in CI. We can resolve the rustfmt issue permanently by removing the required_version config option. We also need to fix the latest clippy warnings.

Done as a single patch so that all patches pass CI.

Kixunil
Kixunil previously approved these changes Jan 30, 2023
Copy link
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 f67e8c5

@apoelstra
Copy link
Member

Can you also change the required_version in rustfmt.toml?

Probably we should just remove that line, it seems like it's going to cause more breakage than it saves.

@tcharding
Copy link
Member Author

Whats required_version got to do with current breakages? IIUC required_version is just a minimum so that the config options in rustfmt.toml are all available, or am I misunderstanding its usage. CI constantly uses the latest clippy version and that's why we get failures that are never noticed locally (because I never run cargo update until CI clippy job fails). It would be nice if we could pin the version then update the pin at the same time as the patch that fixes newly introduced warnings so that the whole pipeline of PRs didn't get blocked.

It looks like our new github action toolchain installer is configurable so we should be able to get this idea working. What do you think?

https://github.com/dtolnay/rust-toolchain

@apoelstra
Copy link
Member

apoelstra commented Jan 30, 2023

@tcharding the current CI failure has the line Error: rustfmt version (1.5.2) doesn't match the required version (1.5.1) repeated like 20 times.

This is rustfmt that has a fixed version, not clippy. You are correct about clippy.

@tcharding
Copy link
Member Author

Woops I should have clicked on the CI fail, my bad. Staring at that fail all week in every PR and already I've developed a bad habit - happens so fast.

Currently CI is broken because we use the latest version of `rustfmt`
and `clippy` in CI. We can resolve the `rustfmt` issue permanently by
removing the `required_version` config option. We also need to fix the
latest clippy warnings.

Done as a single patch so that all patches pass CI.
@tcharding tcharding changed the title Fix clippy warnings Fix CI Jan 30, 2023
@tcharding
Copy link
Member Author

Force pushed with the rustfmt change, PR description re-written explaining why.

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 d118415

@apoelstra apoelstra merged commit 65eb166 into rust-bitcoin:master Jan 30, 2023
@apoelstra
Copy link
Member

Heh, I guess I could've waited to see if CI was actually fixed...oops.

@tcharding
Copy link
Member Author

Huh, it didn't fix it?

@apoelstra
Copy link
Member

I think it did, I just don't know how to tell.

@tcharding
Copy link
Member Author

I rebased this one to check it: #561

@tcharding
Copy link
Member Author

Real time chat via github - I guess I should really set up IRC so we can chat at times like this.

@tcharding tcharding deleted the 01-29-clippy branch January 31, 2023 08:45
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