diff --git a/.github/workflows/rebase-translations.yml b/.github/workflows/rebase-translations.yml index 37f5daa..25a9870 100644 --- a/.github/workflows/rebase-translations.yml +++ b/.github/workflows/rebase-translations.yml @@ -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 @@ -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. + # 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: