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

Update book for backport, release and sync #12762

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

flip1995
Copy link
Member

@flip1995 flip1995 commented May 4, 2024

Those were outdated anyway. Now with switching to Josh, the documentation should also be updated, as a lot of things got simplified. This updates the documentation on how to do syncs with josh, how to do releases and how to do backports.

r? @xFrednet

changelog: none

@flip1995 flip1995 added the S-blocked Status: marked as blocked ❌ on something else such as an RFC or other implementation work label May 4, 2024
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label May 4, 2024
@flip1995 flip1995 marked this pull request as draft May 4, 2024 14:03
@xFrednet
Copy link
Member

I've been busy last week and this one is also pretty full. If it's alright with you, I'd push this review into some time next week, probably after the 23rd.

@flip1995
Copy link
Member Author

No worries. I'm on a business trip for the next 2 weeks and until then I'll probably won't be able to actually do the switch to Josh.

@flip1995 flip1995 force-pushed the josh-docs-update branch from 74aaeb7 to 0dcb0ca Compare May 17, 2024 01:49
@xFrednet
Copy link
Member

I'll review this some time this week.

I also found a related Hackmd, in case you didn't knew about it: https://hackmd.io/7pOuxnkdQDaL1Y1FQr65xg

@flip1995
Copy link
Member Author

Yup, this was my guide to setup Josh.

Parts of this (and the JOSH) PR can be merged without moving to Josh. Should I split up the PR or are you fine reviewing it like this?

@xFrednet
Copy link
Member

Parts of this (and the JOSH) PR can be merged without moving to Josh. Should I split up the PR or are you fine reviewing it like this?

I'm fine with either. It probably depends on how long you're guesstimating that it'll take to move to JOSH. If it will take more time then it might be better to split the changes. But if it'll be reasonably soon we can keep them all in one PR :D

Copy link
Member

@xFrednet xFrednet left a comment

Choose a reason for hiding this comment

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

Well written, I have some NITs, but all of them are superficial. Thank you, for putting this together :D

book/src/development/infrastructure/backport.md Outdated Show resolved Hide resolved
book/src/development/infrastructure/sync.md Outdated Show resolved Hide resolved
book/src/development/infrastructure/sync.md Outdated Show resolved Hide resolved
@xFrednet xFrednet removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Jun 30, 2024
@xFrednet
Copy link
Member

Hey @flip1995 , this is a ping from triage, since there hasn't been any activity in some time. Are you still planning to continue this implementation?

If you have any questions, you're always welcome to ask them in this PR or on Zulip.

@rustbot author

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action from the author. (Use `@rustbot ready` to update this status) and removed S-blocked Status: marked as blocked ❌ on something else such as an RFC or other implementation work labels Jul 23, 2024
@flip1995
Copy link
Member Author

Addressed all comments and rebased 👍 Thanks for the reminder. I'll ask the Josh team about the last blocker I see for the move.

@xFrednet
Copy link
Member

Perfect, this version looks good to me. Let's hope the issue is resolved soon :D

@blyxyas
Copy link
Member

blyxyas commented Aug 15, 2024

We should probably mention the old way, I used it a lot to benchmark changes in Clippy. I can imagine there are other reasons one may want to import a change from Clippy to Rust upstream

@flip1995
Copy link
Member Author

flip1995 commented Sep 3, 2024

We should probably mention the old way,

What's the old way? Do you mean the old way to sync? That will no longer work after moving to josh.

The only reason I see for importing Clippy changes to Rust upstream is for backporting and that doesn't change. I just updated to documentation to how it's been done for quite some time now.

Those were outdated anyway. Now with switching to Josh, the documentation should
also be updated, as a lot of things got simplified. This updates the
documentation on how to do syncs with josh, how to do releases and how to do
backports.
github-merge-queue bot pushed a commit that referenced this pull request Nov 19, 2024
Based on #13693

Adds 2 subcommands to `cargo dev`:

- `cargo dev sync update_nightly`: Which updates the nightly versions in
`rust-toolchain` and `clippy_utils/README.md`
- `cargo dev release bump_version`: Bumps the version in all relevant
`Cargo.toml` files

Those are pulled out of
#12759, which I'll rebase
on this.

Next step is to update the documentation, which I'll partly pull out of
#12762

r? @blyxyas (as you reviewed the first PR in the chain and were assigned
to the second one)

cc #13556

changelog: none
github-merge-queue bot pushed a commit that referenced this pull request Nov 29, 2024
This updates the documentation after #13694. It is not based on that PR
chain and can be merged independently, but should be merged after that
PR.

This is partly pulled from #12762, but removing the Josh parts.

This includes instructions on how to publish `clippy_utils`.

Closes #13556 (yes, this
is the final PR 🙂)

r? @blyxyas

changelog: `clippy_utils` is now published to crates.io
@bors
Copy link
Contributor

bors commented Nov 29, 2024

☔ The latest upstream changes (presumably af1f78a) made this pull request unmergeable. Please resolve the merge conflicts.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action from the author. (Use `@rustbot ready` to update this status)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants