Skip to content

Rebase: also match resync/* branches (action-translation v0.18.1) #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mmcky merged 3 commits into from
Jul 21, 2026
Merged

Rebase: also match resync/* branches (action-translation v0.18.1) #15

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
503e557
Rebase: also match resync/* branches (action-translation v0.18.1)
mmcky Jul 21, 2026
974b3ed
Comment accuracy: the CLI command is 'translate forward --github'
mmcky Jul 21, 2026
95039c7
Merge branch 'main' into rebase-match-resync-branches
mmcky Jul 21, 2026
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
16 changes: 12 additions & 4 deletions .github/workflows/rebase-translations.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
# 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.
# When a translation PR is merged, this workflow automatically rebases the
# other open translation PRs against the updated main branch. It covers both
# kinds this tool creates: `translation-sync-*` branches from the Action's sync
# mode, and `resync/*` branches from the CLI's `translate forward --github`.
#
# This eliminates merge conflicts caused by multiple upstream PRs
# modifying the same files. See: https://github.com/QuantEcon/action-translation/issues/63
Expand All @@ -17,10 +19,16 @@ on:

jobs:
rebase:
# Only run when a translation-sync PR is merged
# Only run when a translation PR is merged. Both prefixes must be listed:
# sync mode creates `translation-sync-*`, while the CLI's `translate forward --github`
# creates `resync/*`, and a wave of resync PRs goes stale the same way.
Comment thread
Copilot marked this conversation as resolved.
# Keep this in step with `isTranslationBranch` in the action's src/branch-naming.ts
# — this `if` decides whether the job runs, that predicate decides which open PRs
# it then rebases, so a prefix matching only one of them is a no-op run.
if: >
github.event.pull_request.merged == true &&
startsWith(github.event.pull_request.head.ref, 'translation-sync-')
(startsWith(github.event.pull_request.head.ref, 'translation-sync-') ||
startsWith(github.event.pull_request.head.ref, 'resync/'))
runs-on: ubuntu-latest

permissions:
Expand Down
Loading