From 842e3fefbf8f4561b4bad9709f5382be4cffde64 Mon Sep 17 00:00:00 2001 From: Matt McKay Date: Tue, 14 Apr 2026 16:19:53 +1000 Subject: [PATCH 1/3] ci: add rebase-translations workflow (action-translation v0.15.0) --- .github/workflows/rebase-translations.yml | 37 +++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .github/workflows/rebase-translations.yml diff --git a/.github/workflows/rebase-translations.yml b/.github/workflows/rebase-translations.yml new file mode 100644 index 0000000..87a1868 --- /dev/null +++ b/.github/workflows/rebase-translations.yml @@ -0,0 +1,37 @@ +# Rebase Translation PRs +# +# Install this workflow in the TARGET (translated) repository. +# When a translation-sync PR is merged, this workflow automatically +# rebases other open translation-sync PRs against the updated main branch. +# +# This eliminates merge conflicts caused by multiple upstream PRs +# modifying the same files. See: https://github.com/QuantEcon/action-translation/issues/63 +# +# Place this file at: .github/workflows/rebase-translations.yml + +name: Rebase Translation PRs + +on: + pull_request: + types: [closed] + +jobs: + rebase: + # Only run when a translation-sync PR is merged + if: > + github.event.pull_request.merged == true && + startsWith(github.event.pull_request.head.ref, 'translation-sync-') + runs-on: ubuntu-latest + + # Prevent concurrent rebases from overlapping + concurrency: + group: rebase-translations + cancel-in-progress: false + + steps: + - name: Rebase conflicted translation PRs + uses: quantecon/action-translation@v0.15 + with: + mode: rebase + anthropic-api-key: ${{ secrets.ANTHROPIC_API_KEY }} + github-token: ${{ secrets.GITHUB_TOKEN }} From 6424b79ce094d004aa506008537be6892abe5566 Mon Sep 17 00:00:00 2001 From: Matt McKay Date: Tue, 14 Apr 2026 16:31:01 +1000 Subject: [PATCH 2/3] Update .github/workflows/rebase-translations.yml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .github/workflows/rebase-translations.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rebase-translations.yml b/.github/workflows/rebase-translations.yml index 87a1868..2536622 100644 --- a/.github/workflows/rebase-translations.yml +++ b/.github/workflows/rebase-translations.yml @@ -30,7 +30,7 @@ jobs: steps: - name: Rebase conflicted translation PRs - uses: quantecon/action-translation@v0.15 + uses: QuantEcon/action-translation@v0.15.0 with: mode: rebase anthropic-api-key: ${{ secrets.ANTHROPIC_API_KEY }} From 6f60b62afc6d7a678b8b6dd3770104e75abfe2c0 Mon Sep 17 00:00:00 2001 From: Matt McKay Date: Tue, 14 Apr 2026 16:35:54 +1000 Subject: [PATCH 3/3] ci: add permissions block, fix casing and version pin, rename step --- .github/workflows/rebase-translations.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/rebase-translations.yml b/.github/workflows/rebase-translations.yml index 2536622..a950a9a 100644 --- a/.github/workflows/rebase-translations.yml +++ b/.github/workflows/rebase-translations.yml @@ -23,13 +23,17 @@ jobs: startsWith(github.event.pull_request.head.ref, 'translation-sync-') runs-on: ubuntu-latest + permissions: + contents: write + pull-requests: write + # Prevent concurrent rebases from overlapping concurrency: group: rebase-translations cancel-in-progress: false steps: - - name: Rebase conflicted translation PRs + - name: Rebase open translation PRs uses: QuantEcon/action-translation@v0.15.0 with: mode: rebase