From 578fd157bc0ea484ca499603cd0b096c9bc3797e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 24 Aug 2025 23:18:12 +0000 Subject: [PATCH 1/3] Initial plan From 79945e5f87f4d4d27f55d72ce65ee19e8385db89 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 24 Aug 2025 23:22:28 +0000 Subject: [PATCH 2/3] Update sync workflow to only trigger on v12.0 pushes with concurrency control Co-authored-by: BenjaminMichaelis <22186029+BenjaminMichaelis@users.noreply.github.com> --- .github/workflows/sync-version-branches.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/sync-version-branches.yml b/.github/workflows/sync-version-branches.yml index faa99ae7..fffe0de4 100644 --- a/.github/workflows/sync-version-branches.yml +++ b/.github/workflows/sync-version-branches.yml @@ -1,14 +1,20 @@ -name: Sync branches -on: +name: Sync v12.0 -> v13.0 +'on': push: - branches: [ 'v12.0', 'v13.0' ] + branches: + - 'v12.0' + workflow_dispatch: + +concurrency: + group: sync-v12-to-v13 + cancel-in-progress: true jobs: sync_branches: name: Sync Branches runs-on: ubuntu-latest steps: - - name: Keep branches in sync + - name: Keep v13.0 in sync with v12.0 uses: jojomatik/sync-branch@v2.0.2 with: source: "v12.0" @@ -17,7 +23,4 @@ jobs: resolve_conflicts: "false" git_committer_name: 'BenjaminMichaelisBot' git_committer_email: 'github@relay.benjamin.michaelis.net' - # The access token to push to the repository - # Optional - # Default: github.token github_token: ${{ secrets.GIT_PUSHTOKEN }} \ No newline at end of file From 22811d256f8804fba40301d862954f9fbc7383a0 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 24 Aug 2025 23:24:08 +0000 Subject: [PATCH 3/3] Final polish: standardize YAML format to match repository conventions Co-authored-by: BenjaminMichaelis <22186029+BenjaminMichaelis@users.noreply.github.com> --- .github/workflows/sync-version-branches.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sync-version-branches.yml b/.github/workflows/sync-version-branches.yml index fffe0de4..e322acdb 100644 --- a/.github/workflows/sync-version-branches.yml +++ b/.github/workflows/sync-version-branches.yml @@ -1,5 +1,5 @@ name: Sync v12.0 -> v13.0 -'on': +on: push: branches: - 'v12.0' @@ -23,4 +23,4 @@ jobs: resolve_conflicts: "false" git_committer_name: 'BenjaminMichaelisBot' git_committer_email: 'github@relay.benjamin.michaelis.net' - github_token: ${{ secrets.GIT_PUSHTOKEN }} \ No newline at end of file + github_token: ${{ secrets.GIT_PUSHTOKEN }}