@@ -97,13 +97,13 @@ def open_pr(
97
97
if not is_primary_release :
98
98
body .append (' - [ ] Remove and re-add the "Update dependencies" label to the PR to trigger just this workflow.' )
99
99
body .append (' - [ ] Wait for the "Update dependencies" workflow to push a commit updating the dependencies.' )
100
- body .append (' - [ ] Mark the PR as ready for review to trigger the full set of PR checks.' )
101
100
101
+ body .append (' - [ ] Mark the PR as ready for review to trigger the full set of PR checks.' )
102
102
body .append (' - [ ] Approve and merge this PR. Make sure `Create a merge commit` is selected rather than `Squash and merge` or `Rebase and merge`.' )
103
103
104
104
if is_primary_release :
105
105
body .append (' - [ ] Merge the mergeback PR that will automatically be created once this PR is merged.' )
106
- body .append (' - [ ] Merge the v1 release PR that will automatically be created once this PR is merged.' )
106
+ body .append (' - [ ] Merge all backport PRs to older release branches, that will automatically be created once this PR is merged.' )
107
107
108
108
title = f'Merge { source_branch } into { target_branch } '
109
109
labels = ['Update dependencies' ] if not is_primary_release else []
@@ -300,7 +300,6 @@ def main():
300
300
301
301
# Also revert the "Update checked-in dependencies" commit created by Actions.
302
302
update_dependencies_commit = run_git ('log' , '--grep' , '^Update checked-in dependencies' , '--format=%H' ).split ()[0 ]
303
- # TODO: why is this failing for the v2 branch currently...?
304
303
print (f' Reverting { update_dependencies_commit } ' )
305
304
run_git ('revert' , update_dependencies_commit , '--no-edit' )
306
305
@@ -326,7 +325,7 @@ def main():
326
325
327
326
# Remove changelog notes from all versions that do not apply to the vOlder branch
328
327
print (f'Removing changelog notes that do not apply to v{ target_branch_major_version } ' )
329
- for v in range (int (target_branch_major_version ) + 1 , int (source_branch_major_version ) + 1 ):
328
+ for v in range (int (source_branch_major_version ) , int (target_branch_major_version ), - 1 ):
330
329
print (f'Removing changelog notes that are tagged [v{ v } + only\]' )
331
330
subprocess .check_output (['sed' , '-i' , f'/^- \[v{ v } + only\]/d' , 'CHANGELOG.md' ])
332
331
0 commit comments