From 200139f7c7af83d23f6a00e2d7cdfd1eb78c1d77 Mon Sep 17 00:00:00 2001 From: zyf722 Date: Sun, 3 Nov 2024 15:52:14 +0800 Subject: [PATCH] fix(ci): run merge aftering pulling from Lokalise --- .github/workflows/i18n-update-scheduled.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/i18n-update-scheduled.yml b/.github/workflows/i18n-update-scheduled.yml index 5c411b2aa..fb812782c 100644 --- a/.github/workflows/i18n-update-scheduled.yml +++ b/.github/workflows/i18n-update-scheduled.yml @@ -47,7 +47,6 @@ jobs: git config pull.rebase false git fetch origin $BRANCH:$BRANCH git checkout $BRANCH - git pull origin develop else git checkout -b $BRANCH fi @@ -101,7 +100,9 @@ jobs: echo "LAST_COMMIT_SHA_PULL=$(git log -n 1 --format="%H" -- src/livecodes/i18n/locales)" >> $GITHUB_ENV - name: Push changes - run: git push origin $BRANCH + run: | + git pull origin ${{ github.event.repository.default_branch }} + git push origin $BRANCH - name: Check if has differences between ${{ env.BRANCH }} and ${{ github.event.repository.default_branch }} id: check-diff