Skip to content

🐛 fix(i18n): fork l10n_crowdin from the resolved integration branch - #619

Merged
scttbnsn merged 1 commit into
dev/v1.6from
fix/v1.6-crowdin-l10n-base
Jul 27, 2026
Merged

🐛 fix(i18n): fork l10n_crowdin from the resolved integration branch#619
scttbnsn merged 1 commit into
dev/v1.6from
fix/v1.6-crowdin-l10n-base

Conversation

@scttbnsn

@scttbnsn scttbnsn commented Jul 27, 2026

Copy link
Copy Markdown
Contributor

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 — 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_crowdin forks from the branch the PR actually targets. BASE is passed via env (no inline template interpolation in run:).

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

  • 🔧 Changed Crowdin workflow to fetch and check out the resolved integration branch before running the Crowdin action.
  • 🐛 Fixed translation PRs being based on the triggering ref during devmain syncs, preventing persistent conflicts.
  • ✨ Added workflow tests covering step ordering, BASE configuration, and fetch-before-checkout behavior.

Concerns

  • Verify the resolved BASE branch always exists on origin before checkout.

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.
@vercel

vercel Bot commented Jul 27, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
drydock-website Ready Ready Preview, Comment Jul 27, 2026 10:32pm
drydockdemo-website Ready Ready Preview, Comment Jul 27, 2026 10:32pm

@coderabbitai

coderabbitai Bot commented Jul 27, 2026

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro Plus

Run ID: 0ac57225-13f9-41a5-882c-3d9dbfb4a681

📥 Commits

Reviewing files that changed from the base of the PR and between 52b73c2 and 46f1642.

📒 Files selected for processing (2)
  • .github/tests/crowdin-workflow.test.ts
  • .github/workflows/i18n-crowdin.yml

📝 Walkthrough

Walkthrough

The Crowdin sync workflow adds a step that fetches the branch resolved by steps.base.outputs.name and checks it out locally before running the Crowdin action. Tests now verify the step ordering, BASE environment value, and ordered git fetch and git checkout -B commands.

Possibly related PRs

🚥 Pre-merge checks | ✅ 2
✅ Passed checks (2 passed)
Check name Status Explanation
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch fix/v1.6-crowdin-l10n-base

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.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@scttbnsn
scttbnsn merged commit 8f228a6 into dev/v1.6 Jul 27, 2026
25 checks passed
@scttbnsn
scttbnsn deleted the fix/v1.6-crowdin-l10n-base branch July 27, 2026 23:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant