diff --git a/.github/workflows/release-automation-reusable.yml b/.github/workflows/release-automation-reusable.yml index d293783..f40442f 100644 --- a/.github/workflows/release-automation-reusable.yml +++ b/.github/workflows/release-automation-reusable.yml @@ -1515,7 +1515,7 @@ jobs: exit 0 fi - SYNC_BRANCH="post-release/${RELEASE_TAG}" + SYNC_BRANCH="pr-to-main/${RELEASE_TAG}" # Create branch, stage, commit, push git checkout -b "$SYNC_BRANCH" diff --git a/release_automation/docs/technical-architecture.md b/release_automation/docs/technical-architecture.md index aa8ae40..47d03b9 100644 --- a/release_automation/docs/technical-architecture.md +++ b/release_automation/docs/technical-architecture.md @@ -503,7 +503,7 @@ Creates a sync PR to main after release publication. - Release-specific CHANGELOG: `CHANGELOG/CHANGELOG-rX.md` (X = cycle number from release tag) - README Release Information section update (between delimiters) -**Branch:** `post-release/rX.Y` created from main. +**Branch:** `pr-to-main/rX.Y` created from main. **Merge policy:** Human approval required (no auto-merge). diff --git a/release_automation/scripts/post_release_syncer.py b/release_automation/scripts/post_release_syncer.py index 887f4dc..b22df84 100644 --- a/release_automation/scripts/post_release_syncer.py +++ b/release_automation/scripts/post_release_syncer.py @@ -62,7 +62,7 @@ def create_sync_pr( Returns: SyncPRResult with PR details or error """ - sync_branch = f"post-release/{release_tag}" + sync_branch = f"pr-to-main/{release_tag}" try: # Step 1: Create sync branch from main diff --git a/release_automation/tests/test_post_release_syncer.py b/release_automation/tests/test_post_release_syncer.py index a85b7ff..a9d54ec 100644 --- a/release_automation/tests/test_post_release_syncer.py +++ b/release_automation/tests/test_post_release_syncer.py @@ -117,7 +117,7 @@ def test_sync_changelog_success(self, syncer, mock_github_client): result = syncer._sync_changelog( "release-snapshot/r4.1-abc123", - "post-release/r4.1", + "pr-to-main/r4.1", "r4.1" ) @@ -125,7 +125,7 @@ def test_sync_changelog_success(self, syncer, mock_github_client): mock_github_client.update_file.assert_called_once() call_kwargs = mock_github_client.update_file.call_args.kwargs assert call_kwargs["path"] == "CHANGELOG/CHANGELOG-r4.md" - assert call_kwargs["branch"] == "post-release/r4.1" + assert call_kwargs["branch"] == "pr-to-main/r4.1" def test_sync_changelog_not_found(self, syncer, mock_github_client): """CHANGELOG not found - returns False.""" @@ -133,7 +133,7 @@ def test_sync_changelog_not_found(self, syncer, mock_github_client): result = syncer._sync_changelog( "release-snapshot/r4.1-abc123", - "post-release/r4.1", + "pr-to-main/r4.1", "r4.1" ) @@ -147,7 +147,7 @@ def test_sync_changelog_update_fails(self, syncer, mock_github_client): result = syncer._sync_changelog( "release-snapshot/r4.1-abc123", - "post-release/r4.1", + "pr-to-main/r4.1", "r4.1" ) @@ -157,7 +157,7 @@ def test_sync_changelog_invalid_release_tag(self, syncer, mock_github_client): """Invalid release tag format - returns False.""" result = syncer._sync_changelog( "release-snapshot/invalid-abc123", - "post-release/invalid", + "pr-to-main/invalid", "invalid" ) @@ -172,7 +172,7 @@ def test_create_pr_success(self, syncer, mock_github_client): """Successfully creates PR.""" mock_github_client._run_gh.return_value = "https://github.com/test-org/test-repo/pull/42" - result = syncer._create_pr("r4.1", "post-release/r4.1") + result = syncer._create_pr("r4.1", "pr-to-main/r4.1") assert result is not None assert result["number"] == 42 @@ -183,7 +183,7 @@ def test_create_pr_already_exists(self, syncer, mock_github_client): mock_github_client._run_gh.side_effect = GitHubClientError("PR already exists") mock_github_client.find_pr_for_branch.return_value = 99 - result = syncer._create_pr("r4.1", "post-release/r4.1") + result = syncer._create_pr("r4.1", "pr-to-main/r4.1") assert result is not None assert result["number"] == 99