Skip to content

Commit ee748cf

Browse files
committed
respond to more review comments
1 parent 57932be commit ee748cf

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

.github/update-release-branch.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,13 @@ def open_pr(
9797
if not is_primary_release:
9898
body.append(' - [ ] Remove and re-add the "Update dependencies" label to the PR to trigger just this workflow.')
9999
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.')
101100

101+
body.append(' - [ ] Mark the PR as ready for review to trigger the full set of PR checks.')
102102
body.append(' - [ ] Approve and merge this PR. Make sure `Create a merge commit` is selected rather than `Squash and merge` or `Rebase and merge`.')
103103

104104
if is_primary_release:
105105
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.')
107107

108108
title = f'Merge {source_branch} into {target_branch}'
109109
labels = ['Update dependencies'] if not is_primary_release else []
@@ -300,7 +300,6 @@ def main():
300300

301301
# Also revert the "Update checked-in dependencies" commit created by Actions.
302302
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...?
304303
print(f' Reverting {update_dependencies_commit}')
305304
run_git('revert', update_dependencies_commit, '--no-edit')
306305

@@ -326,7 +325,7 @@ def main():
326325

327326
# Remove changelog notes from all versions that do not apply to the vOlder branch
328327
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):
330329
print(f'Removing changelog notes that are tagged [v{v}+ only\]')
331330
subprocess.check_output(['sed', '-i', f'/^- \[v{v}+ only\]/d', 'CHANGELOG.md'])
332331

.github/workflows/post-release-mergeback.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# tag
44
# 2. Updates the `vN` tag to refer to this merge commit.
55
# 3. Iff vN == vLatest, merges any changes from the release back into the main branch.
6-
# Typically, this is just a single commit that updates the changelog.
6+
# Typically, this is two commits – one to update the version number and one to update dependencies.
77
name: Tag release and merge back
88

99
on:

.github/workflows/update-release-branch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
timeout-minutes: 45
106106
runs-on: ubuntu-latest
107107
needs: [prepare]
108-
if: ${{ (github.event_name == 'push') && needs.prepare.outputs.backport_target_branches != '[]' && needs.prepare.outputs.backport_target_branches != '' }}
108+
if: ${{ (github.event_name == 'push') && needs.prepare.outputs.backport_target_branches != '[]' }}
109109
strategy:
110110
fail-fast: false
111111
matrix:

0 commit comments

Comments
 (0)