@@ -67,40 +67,48 @@ def open_pr(
67
67
body .append ('Merging ' + source_branch_short_sha + ' into ' + target_branch )
68
68
69
69
body .append ('' )
70
- body .append ('Conductor for this PR is @' + conductor )
70
+ body .append (f 'Conductor for this PR is @{ conductor } .' )
71
71
72
72
# List all PRs merged
73
73
if len (pull_requests ) > 0 :
74
74
body .append ('' )
75
75
body .append ('Contains the following pull requests:' )
76
76
for pr in pull_requests :
77
77
merger = get_merger_of_pr (repo , pr )
78
- body .append ('- #' + str ( pr .number ) + ' - ' + pr . title + ' (@' + merger + ' )' )
78
+ body .append (f '- #{ pr .number } (@ { merger } )' )
79
79
80
80
# List all commits not part of a PR
81
81
if len (commits_without_pull_requests ) > 0 :
82
82
body .append ('' )
83
83
body .append ('Contains the following commits not from a pull request:' )
84
84
for commit in commits_without_pull_requests :
85
- author_description = ' (@' + commit .author .login + ' )' if commit .author is not None else ''
86
- body .append ('- ' + commit .sha + ' - ' + get_truncated_commit_message (commit ) + author_description )
85
+ author_description = f ' (@{ commit .author .login } )' if commit .author is not None else ''
86
+ body .append (f '- { commit .sha } - { get_truncated_commit_message (commit )} { author_description } ' )
87
87
88
88
body .append ('' )
89
- body .append ('Please review the following:' )
89
+ body .append ('Please do the following:' )
90
90
if len (conflicted_files ) > 0 :
91
- body .append (' - [ ] The `package.json` file contains the correct version.' )
92
- body .append (' - [ ] You have added commits to this branch that resolve the merge conflicts ' +
91
+ body .append (' - [ ] Ensure `package.json` file contains the correct version.' )
92
+ body .append (' - [ ] Add commits to this branch to resolve the merge conflicts ' +
93
93
'in the following files:' )
94
94
body .extend ([f' - [ ] `{ file } `' for file in conflicted_files ])
95
- body .append (' - [ ] Another maintainer has reviewed the additional commits you added to this ' +
95
+ body .append (' - [ ] Ensure another maintainer has reviewed the additional commits you added to this ' +
96
96
'branch to resolve the merge conflicts.' )
97
- body .append (' - [ ] The CHANGELOG displays the correct version and date.' )
98
- body .append (' - [ ] The CHANGELOG includes all relevant, user-facing changes since the last release.' )
99
- body .append (' - [ ] There are no unexpected commits being merged into the ' + target_branch + ' branch.' )
100
- body .append (' - [ ] The docs team is aware of any documentation changes that need to be released.' )
97
+ body .append (' - [ ] Ensure the CHANGELOG displays the correct version and date.' )
98
+ body .append (' - [ ] Ensure the CHANGELOG includes all relevant, user-facing changes since the last release.' )
99
+ body .append (' - [ ] Check that there are not any unexpected commits being merged into the ' + target_branch + ' branch.' )
100
+ body .append (' - [ ] Ensure the docs team is aware of any documentation changes that need to be released.' )
101
+
102
+ if not is_v2_release :
103
+ body .append (' - [ ] Remove and re-add the "Update dependencies" label to the PR to trigger just this workflow.' )
104
+ body .append (' - [ ] Wait for the "Update dependencies" workflow to push a commit updating the dependencies.' )
105
+ body .append (' - [ ] Mark the PR as ready for review to trigger the full set of PR checks.' )
106
+
107
+ body .append (' - [ ] Approve and merge this PR.' )
108
+
101
109
if is_v2_release :
102
- body .append (' - [ ] The mergeback PR is merged back into ' + source_branch + ' after this PR is merged.' )
103
- body .append (' - [ ] The v1 release PR is merged after this PR is merged.' )
110
+ body .append (' - [ ] Merge the mergeback PR that will automatically be created once this PR is merged.' )
111
+ body .append (' - [ ] Merge the v1 release PR that will automatically be created once this PR is merged.' )
104
112
105
113
title = 'Merge ' + source_branch + ' into ' + target_branch
106
114
0 commit comments