🐛 fix(i18n): fork l10n_crowdin from the resolved integration branch - #619
Merged
Conversation
The Crowdin workflow checks out the triggering ref, which is main whenever a dev→main sync merge touches locale files. The crowdin action then forked l10n_crowdin from main's squash history while opening the PR against the dev base, leaving the translation PR permanently conflicting (#601, #618). Switch to the resolved base branch before the crowdin action runs.
scttbnsn
requested review from
ALARGECOMPANY and
biggest-littlest
as code owners
July 27, 2026 22:31
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: CHILL Plan: Pro Plus Run ID: 📒 Files selected for processing (2)
📝 WalkthroughWalkthroughThe Crowdin sync workflow adds a step that fetches the branch resolved by Possibly related PRs
🚥 Pre-merge checks | ✅ 2✅ Passed checks (2 passed)
✨ Finishing Touches📝 Generate docstrings
🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The Crowdin workflow checks out the triggering ref, which is
mainwhenever a dev→main sync merge touches locale files. The crowdin action then forkedl10n_crowdinfrom main's squash history while opening the PR against the dev base, leaving the translation PR permanently CONFLICTING (#601, #618 — closing #601 didn't cure it because the next run recreated the branch the same broken way).Fix: after resolving the integration branch, fetch it and switch to it before the crowdin action runs, so
l10n_crowdinforks from the branch the PR actually targets. BASE is passed viaenv(no inline template interpolation inrun:).Covered by a new workflow test asserting the step's position (after
base, before the crowdin action), env wiring, and fetch-before-checkout ordering.Changelog
dev→mainsyncs, preventing persistent conflicts.BASEconfiguration, and fetch-before-checkout behavior.Concerns
BASEbranch always exists onoriginbefore checkout.