fix(ci): run merge aftering pulling from Lokalise

zyf722 · Nov 3, 2024 · 200139f · 200139f
1 parent 68d8997
commit 200139f
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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