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 backport, release and sync documentation #13700

Merged
merged 1 commit into from
Nov 29, 2024

Conversation

flip1995
Copy link
Member

@flip1995 flip1995 commented Nov 17, 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

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Nov 17, 2024
Copy link
Contributor

@BD103 BD103 left a comment

Choose a reason for hiding this comment

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

Just one small thing that caught my eye :)

Comment on lines +10 to +16
1. [Defining Remotes](#defining-remotes)
1. [Bump Version](#bump-version)
1. [Find the Clippy commit](#find-the-clippy-commit)
1. [Update the `beta` branch](#update-the-beta-branch)
1. [Update the `stable` branch](#update-the-stable-branch)
1. [Tag the stable commit](#tag-the-stable-commit)
1. [Update `CHANGELOG.md`](#update-changelogmd)
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
1. [Defining Remotes](#defining-remotes)
1. [Bump Version](#bump-version)
1. [Find the Clippy commit](#find-the-clippy-commit)
1. [Update the `beta` branch](#update-the-beta-branch)
1. [Update the `stable` branch](#update-the-stable-branch)
1. [Tag the stable commit](#tag-the-stable-commit)
1. [Update `CHANGELOG.md`](#update-changelogmd)
1. [Defining Remotes](#defining-remotes)
2. [Bump Version](#bump-version)
3. [Find the Clippy commit](#find-the-clippy-commit)
4. [Update the `beta` branch](#update-the-beta-branch)
5. [Update the `stable` branch](#update-the-stable-branch)
6. [Tag the stable commit](#tag-the-stable-commit)
7. [Update `CHANGELOG.md`](#update-changelogmd)

Copy link
Member

Choose a reason for hiding this comment

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

MdBook renders the original source as a correctly ordered list, although it would be cool to have the numbered list even when reading source.

Copy link
Member Author

Choose a reason for hiding this comment

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

I went with that, so when inserting a new chapter in the future, you don't have to update all the following numbers. But happy to change that.

Copy link
Member

@blyxyas blyxyas left a comment

Choose a reason for hiding this comment

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

Good PR! 🤠 I had comments, some are more important than others. 🌵 (Yeehaw)

book/src/development/infrastructure/backport.md Outdated Show resolved Hide resolved
book/src/development/infrastructure/backport.md Outdated Show resolved Hide resolved
book/src/development/infrastructure/backport.md Outdated Show resolved Hide resolved
book/src/development/infrastructure/backport.md Outdated Show resolved Hide resolved
book/src/development/infrastructure/backport.md Outdated Show resolved Hide resolved
Comment on lines +10 to +16
1. [Defining Remotes](#defining-remotes)
1. [Bump Version](#bump-version)
1. [Find the Clippy commit](#find-the-clippy-commit)
1. [Update the `beta` branch](#update-the-beta-branch)
1. [Update the `stable` branch](#update-the-stable-branch)
1. [Tag the stable commit](#tag-the-stable-commit)
1. [Update `CHANGELOG.md`](#update-changelogmd)
Copy link
Member

Choose a reason for hiding this comment

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

MdBook renders the original source as a correctly ordered list, although it would be cool to have the numbered list even when reading source.

book/src/development/infrastructure/release.md Outdated Show resolved Hide resolved
book/src/development/infrastructure/release.md Outdated Show resolved Hide resolved
Copy link
Member

Choose a reason for hiding this comment

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

Is there a reason to change the branch names? 🤔 I think those were fine.

Copy link
Member Author

@flip1995 flip1995 Nov 22, 2024

Choose a reason for hiding this comment

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

Yes. rustbot checks all PRs for merge commits and will comment on it, if it finds one. This can be opted out with allowing some PR titles to have merge commits:

# Have rustbot inform users about the *No Merge Policy*
[no-merges]
exclude_titles = ["Rustup"] # exclude syncs from rust-lang/rust
labels = ["has-merge-commits", "S-waiting-on-author"]

In the Clippy repo it is Rustup, in the Rust repo it is subtree update.

By using rustup as a branch name in the Clippy repo and clippy-subtree-update in the Rust repo, GitHub will automatically set the title when opening the PR to Rustup and Clippy subtree update respectively. So rustbot won't complain about these PRs.

@flip1995
Copy link
Member Author

@rustbot ready

I addressed all comments in 9858a4e, except for #13700 (comment). LMK, if you want me to change that.

I'll rebase+squash once the PR is approved.

Copy link
Member

@blyxyas blyxyas left a comment

Choose a reason for hiding this comment

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

LGTM, thanks! ❤️ 🌈
Yeehaw 🤠

@blyxyas
Copy link
Member

blyxyas commented Nov 28, 2024

@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-waiting-on-review Status: Awaiting review from the assignee but also interested parties labels Nov 28, 2024
@flip1995 flip1995 added this pull request to the merge queue Nov 29, 2024
@flip1995 flip1995 removed this pull request from the merge queue due to a manual request Nov 29, 2024
@flip1995 flip1995 added this pull request to the merge queue Nov 29, 2024
Merged via the queue into rust-lang:master with commit af1f78a Nov 29, 2024
9 checks passed
@flip1995 flip1995 deleted the docs-update branch November 29, 2024 15:16
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.

Consider publishing clippy_utils as a crates.io crate for others to reuse
4 participants