Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release-automation-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1515,7 +1515,7 @@ jobs:
exit 0
fi

SYNC_BRANCH="post-release/${RELEASE_TAG}"
SYNC_BRANCH="tmp/sync-main/${RELEASE_TAG}"

# Create branch, stage, commit, push
git checkout -b "$SYNC_BRANCH"
Expand Down
2 changes: 1 addition & 1 deletion release_automation/docs/technical-architecture.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:** `tmp/sync-main/rX.Y` created from main.

**Merge policy:** Human approval required (no auto-merge).

Expand Down
2 changes: 1 addition & 1 deletion release_automation/scripts/post_release_syncer.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"tmp/sync-main/{release_tag}"

try:
# Step 1: Create sync branch from main
Expand Down
14 changes: 7 additions & 7 deletions release_automation/tests/test_post_release_syncer.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,23 +117,23 @@ def test_sync_changelog_success(self, syncer, mock_github_client):

result = syncer._sync_changelog(
"release-snapshot/r4.1-abc123",
"post-release/r4.1",
"tmp/sync-main/r4.1",
"r4.1"
)

assert result is True
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"] == "tmp/sync-main/r4.1"

def test_sync_changelog_not_found(self, syncer, mock_github_client):
"""CHANGELOG not found - returns False."""
mock_github_client.get_file_content.return_value = None

result = syncer._sync_changelog(
"release-snapshot/r4.1-abc123",
"post-release/r4.1",
"tmp/sync-main/r4.1",
"r4.1"
)

Expand All @@ -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",
"tmp/sync-main/r4.1",
"r4.1"
)

Expand All @@ -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",
"tmp/sync-main/invalid",
"invalid"
)

Expand All @@ -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", "tmp/sync-main/r4.1")

assert result is not None
assert result["number"] == 42
Expand All @@ -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", "tmp/sync-main/r4.1")

assert result is not None
assert result["number"] == 99
Expand Down