Skip to content

Commit ef358d1

Browse files
committed
Auto merge of #6288 - flip1995:changelog_internal, r=<try>
[WIP] Require the `changelog:` entry in the PR body to be modified r? `@ghost` (CI PR, so expect many bors tries. Will assign later) changelog: none
2 parents c2cf40c + e6276ec commit ef358d1

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Thank you for making Clippy better!
22

33
We're collecting our changelog from pull request descriptions.
4-
If your PR only updates to the latest nightly, you can leave the
5-
`changelog` entry as `none`. Otherwise, please write a short comment
4+
If your PR only includes internal changes, you can just change the
5+
`changelog` entry to `internal`. Otherwise, please write a short comment
66
explaining your change.
77

88
If your PR fixes an issue, you can add "fixes #issue_number" into this
@@ -28,5 +28,5 @@ Delete this line and everything above before opening your PR.
2828

2929
---
3030

31-
*Please keep the line below*
31+
*Please adapt the line below (Use "internal" for internal only changes)*
3232
changelog: none

.github/workflows/clippy_bors.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@ jobs:
4040
if [[ -z "$output" ]]; then
4141
echo "ERROR: PR body must contain 'changelog: ...'"
4242
exit 1
43-
elif [[ "$output" = "none" ]]; then
44-
echo "WARNING: changelog is 'none'"
43+
elif [[ -n $(echo "$output" | grep -i "^\s*none\.*$") ]]; then
44+
echo "ERROR: changelog is 'none', use 'internal' for internal only changes"
45+
exit 1
4546
fi
4647
env:
4748
PYTHONIOENCODING: 'utf-8'

util/fetch_prs_between.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ for pr in $(git log --oneline --grep "Merge #" --grep "Merge pull request" --gre
1515
id=$(echo "$pr" | rg -o '#[0-9]{3,5}' | cut -c 2-)
1616
commit=$(echo "$pr" | cut -d' ' -f 1)
1717
message=$(git --no-pager show --pretty=medium "$commit")
18-
if [[ -n $(echo "$message" | rg "^[\s]{4}changelog: [nN]one\.*$") ]]; then
18+
if [[ -n $(echo "$message" | rg -i "^[\s]{4}changelog: internal\.*$") ]]; then
1919
continue
2020
fi
2121

0 commit comments

Comments
 (0)