Skip to content

🌐 fix: Keep Translate Docs Running After Config Version Syncs #797

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

Open
berry-13 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

🌐 fix: Keep Translate Docs Running After Config Version Syncs #797

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions .github/workflows/translate_docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,11 @@ jobs:
git fetch origin "+refs/heads/main:refs/remotes/origin/main"
if git fetch origin "+refs/heads/${TRANSLATE_BRANCH}:refs/remotes/origin/${TRANSLATE_BRANCH}" 2>/dev/null; then
git switch -c "$TRANSLATE_BRANCH" "origin/$TRANSLATE_BRANCH"
git merge --no-edit origin/main
# main wins conflicting hunks: it also edits locale files directly (the
# config version sync rewrites every librechat.yaml snippet), and those
# edits would otherwise conflict with the branch's translations of the
# same lines and stop every run. Non-conflicting translations are kept.
git merge -X theirs --no-edit origin/main
else
git switch -c "$TRANSLATE_BRANCH" origin/main
fi
Expand Down Expand Up @@ -213,7 +217,7 @@ jobs:
if git show-ref --verify --quiet "refs/remotes/origin/${TRANSLATE_BRANCH}"; then
git merge --no-edit "origin/${TRANSLATE_BRANCH}"
fi
git merge --no-edit origin/main
git merge -X theirs --no-edit origin/main
sleep 5
done
if [ "$pushed" != "true" ]; then
Expand Down
Loading