make bors ignore comments in PR template #126501
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
the
S-waiting-on-review
|
@bors r+ Not 100% sure this will work, but let's try it. |
bors
added
S-waiting-on-bors
|
It should, that's how cargo does it. https://github.com/rust-lang/cargo/blob/master/.github/PULL_REQUEST_TEMPLATE.md?plain=1 |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 15, 2024
…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#126354 (Use `Variance` glob imported variants everywhere) - rust-lang#126367 (Point out failing never obligation for `DEPENDENCY_ON_UNIT_NEVER_TYPE_FALLBACK`) - rust-lang#126469 (MIR Shl/Shr: the offset can be computed with rem_euclid) - rust-lang#126471 (Use a consistent way to filter out bounds instead of splitting it into three places) - rust-lang#126472 (build `libcxx-version` only when it doesn't exist) - rust-lang#126497 (delegation: Fix hygiene for `self`) - rust-lang#126501 (make bors ignore comments in PR template) - rust-lang#126509 (std: suggest OnceLock over Once) - rust-lang#126512 (Miri subtree update) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 15, 2024
Rollup merge of rust-lang#126501 - lqd:fix-pr-template, r=Mark-Simulacrum make bors ignore comments in PR template As discussed [here](https://rust-lang.zulipchat.com/#narrow/stream/122651-general/topic/default.20PR.20description.20feedback/near/444794577), the existing PR template is not yet ignored by bors and the html comments show up in git history. This PR uses markers so the html comments are deleted by the bot. r? lcnr
|
I wonder what will new contributors think of this, it might confuse them: Maybe we should add something like "please delete the markers at the top and bottom please" xD |
|
Why? You don’t need to remove the markers if this worked. |
|
Yeah, it's just that it's maybe not obvious that:
I was mostly mentioning 2). But as you said, if the markers stay there, that's fine. Unless people only replace the inner comment and put text between the markers 😀 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As discussed here, the existing PR template is not yet ignored by bors and the html comments show up in git history.
This PR uses markers so the html comments are deleted by the bot.
r? lcnr