Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix handling of backport changelog #2241

Merged
merged 3 commits into from
Apr 16, 2024
Merged

fix handling of backport changelog #2241

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2c09fb
fix handling of backport changelog
nickfyson Apr 15, 2024
71e6077
Merge branch 'main' into nickfyson/speculative-script-fix
nickfyson Apr 16, 2024
c7a8056
simplify while loop
nickfyson Apr 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions .github/update-release-branch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,14 +187,18 @@ def process_changelog_for_backports(source_branch_major_version, target_branch_m

# until we find the first section, just duplicate all lines
while True:
found_first_section = False
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could make not found_first_section the while condition to save a few lines of code, but not blocking.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh yes, of course!

line = f.readline()
if not line:
raise Exception('Could not find any change sections in CHANGELOG.md') # EOF

output += line
if line.startswith('## '):
line = line.replace(f'## {source_branch_major_version}', f'## {target_branch_major_version}')
# we have found the first section, so now handle things differently
found_first_section = True

output += line
if found_first_section:
# we now handle things differently
break

# found_content tracks whether we hit two headings in a row
Expand Down