diff --git a/.gitignore b/.gitignore index 60c3262ff..b943c1d98 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ data *.venv *.log test_output/ +output.txt diff --git a/config/trees/stable-rc.yaml b/config/trees/stable-rc.yaml index 8609ce636..684d7e27b 100644 --- a/config/trees/stable-rc.yaml +++ b/config/trees/stable-rc.yaml @@ -23,6 +23,6 @@ build_configs: <<: *stable-rc branch: 'linux-6.18.y' - stable-rc_6.19: + stable-rc_7.0: <<: *stable-rc - branch: 'linux-6.19.y' + branch: 'linux-7.0.y' diff --git a/tools/sync_stable_branches.py b/tools/sync_stable_branches.py index 94cf8a317..3eca7001b 100755 --- a/tools/sync_stable_branches.py +++ b/tools/sync_stable_branches.py @@ -47,7 +47,8 @@ def get_active_branches(releases_data): continue version = release.get("version", "") - match = re.match(r"^(\d+)\.(\d+)\.", version) + # Match both initial releases (e.g. "7.0") and point releases (e.g. "7.0.1") + match = re.match(r"^(\d+)\.(\d+)", version) if match: major, minor = int(match.group(1)), int(match.group(2)) branches.add((major, minor))