Update contributing section about syncing Clippy #5562
Conversation
flip1995
added
the
S-waiting-on-review
Co-authored-by: Phil Hansch <[email protected]>
| git commit -m "Update Clippy" | ||
| ./x.py test -i --stage 1 src/tools/clippy # This is optional and should succeed anyway | ||
| # Open a PR in rust-lang/rust | ||
| $ git subtree push -P src/tools/clippy clippy-local sync-from-rust |
There was a problem hiding this comment.
Should we leave a disclaimer here that this doesn't work until upstream git is fixed, so for now ppl should manually copy and create a commit?
There was a problem hiding this comment.
Good idea. Even with the gitgitgadget PR fix, you have to put ulimit -s 60000 for the first run. git subtree will then build a cache by going through the complete clippy history, so on subsequent runs this may not be necessary anymore.
I think we can prevent git subtree to go through the complete Clippy history, with a rejoin, but I'm not 100% sure about that anymore.
|
@bors r+ |
|
📌 Commit 842dd07 has been approved by |
Update contributing section about syncing Clippy [Rendered](https://github.com/flip1995/rust-clippy/blob/clippyup_up/CONTRIBUTING.md#fixing-build-failures-caused-by-rust) r? @oli-obk Did I get the sync process right? changelog: none
|
💔 Test failed - checks-action_test |
| ```bash | ||
| git checkout sync-from-rust | ||
| git fetch upstream | ||
| git merge upstream/master |
There was a problem hiding this comment.
Is it normal to get merge conflicts here?
There was a problem hiding this comment.
Not really, but it can happen. I had to add a merge commit on 3/4 rustups.
|
r? @phansch Is highfive already deployed? 🤔 |
|
r? @oli-obk Testing out highfive... |
|
r? @phansch It's alive! |
|
@bors r+ (And thanks for setting up highfive!) |
|
📌 Commit 7a83eaf has been approved by |
|
☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test |
Rendered
r? @oli-obk Did I get the sync process right?
changelog: none