Merge pull request #2241 from github/nickfyson/speculative-script-fix

henrymercer · web-flow · commit 9b87e0a8c4c0 · 2024-04-16T19:00:12.000+01:00
fix handling of backport changelog
diff --git a/.github/update-release-branch.py b/.github/update-release-branch.py
@@ -186,16 +186,17 @@ def process_changelog_for_backports(source_branch_major_version, target_branch_m
   with open('CHANGELOG.md', 'r') as f:
 
     # until we find the first section, just duplicate all lines
-    while True:
+    found_first_section = False
+    while not found_first_section:
       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
-        break
+        found_first_section = True
+
+      output += line
 
     # found_content tracks whether we hit two headings in a row
     found_content = False
