nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 11:19:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: configure upstream fetch refspec so git fetch creates tracking refs (#55422)

Browse Source 
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Diptanil Saha
2026-05-29 21:46:43 +05:30
committed by GitHub
parent 1ae46b54b2
commit 3b44419a7f
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.github/helper/sync_hotfix_translations.sh vendored
View File

@@ -22,15 +22,16 @@ cd "./apps/${APP_NAME}" || exit
git config user.email "developers@erpnext.com" git config user.email "developers@erpnext.com"
git config user.name "frappe-pr-bot" git config user.name "frappe-pr-bot"
git remote set-url upstream "https://github.com/${GITHUB_REPOSITORY}.git" git remote set-url upstream "https://github.com/${GITHUB_REPOSITORY}.git"
git config remote.upstream.fetch "+refs/heads/*:refs/remotes/upstream/*"
gh auth setup-git gh auth setup-git
git fetch upstream "${HOTFIX_BRANCH}" git fetch upstream "${HOTFIX_BRANCH}"
if git ls-remote --exit-code --heads upstream sync_translations_${HOTFIX_BRANCH} >/dev/null 2>&1; then if git ls-remote --exit-code --heads upstream "sync_translations_${HOTFIX_BRANCH}" >/dev/null 2>&1; then
git fetch upstream sync_translations_${HOTFIX_BRANCH} git fetch upstream "sync_translations_${HOTFIX_BRANCH}"
git checkout -b sync_translations_${HOTFIX_BRANCH} "upstream/sync_translations_${HOTFIX_BRANCH}" git checkout -b "sync_translations_${HOTFIX_BRANCH}" "upstream/sync_translations_${HOTFIX_BRANCH}"
git merge -X theirs "upstream/${HOTFIX_BRANCH}" --no-edit git merge -X theirs "upstream/${HOTFIX_BRANCH}" --no-edit
else else
git checkout -b sync_translations_${HOTFIX_BRANCH} "upstream/${HOTFIX_BRANCH}" git checkout -b "sync_translations_${HOTFIX_BRANCH}" "upstream/${HOTFIX_BRANCH}"
fi fi
cd ../.. || exit cd ../.. || exit
@@ -79,8 +80,8 @@ while IFS= read -r file; do
fi fi
done < <(git diff --name-only "${APP_NAME}/locale/" | grep '\.po$' | sort) done < <(git diff --name-only "${APP_NAME}/locale/" | grep '\.po$' | sort)
if git ls-remote --exit-code --heads upstream sync_translations_${HOTFIX_BRANCH} >/dev/null 2>&1; then if git ls-remote --exit-code --heads upstream "sync_translations_${HOTFIX_BRANCH}" >/dev/null 2>&1; then
git fetch upstream sync_translations_${HOTFIX_BRANCH} git fetch upstream "sync_translations_${HOTFIX_BRANCH}"
git merge -X ours "upstream/sync_translations_${HOTFIX_BRANCH}" --no-edit git merge -X ours "upstream/sync_translations_${HOTFIX_BRANCH}" --no-edit
fi fi
git push -u upstream sync_translations_${HOTFIX_BRANCH} git push -u upstream sync_translations_${HOTFIX_BRANCH}