Added git pulls before commits to avoid push failures

KudoAI · Dec 23, 2024 · 3535bfb · 3535bfb
1 parent 20036d7
commit 3535bfb
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 0 deletions.
diff --git a/.github/workflows/sync-chatgpt.js-changes-to-chrome-starter.yml b/.github/workflows/sync-chatgpt.js-changes-to-chrome-starter.yml
@@ -62,11 +62,13 @@ jobs:
       - name: Push changes to KudoAI/chatgpt.js
         run: |
           cd ${{ github.workspace }}/KudoAI/chatgpt.js
+          git pull # again to sync w/ concurrent workflow updates
           git commit -a -n -m "$ESCAPED_MSG ↞ [auto-sync from https://github.com/KudoAI/chatgpt.js]" || true
           git push
 
       - name: Push changes to KudoAI/chatgpt.js-chrome-starter
         run: |
           cd ${{ github.workspace }}/KudoAI/chatgpt.js-chrome-starter
+          git pull # again to sync w/ concurrent workflow updates
           git commit -a -n -m "$ESCAPED_MSG ↞ [auto-sync from https://github.com/KudoAI/chatgpt.js]" || true
           git push
diff --git a/.github/workflows/sync-chrome-starter-changes.yml b/.github/workflows/sync-chrome-starter-changes.yml
@@ -53,6 +53,7 @@ jobs:
       - name: Push changes to KudoAI/chatgpt.js-chrome-starter
         run: |
           cd ${{ github.workspace }}/KudoAI/chatgpt.js-chrome-starter
+          git pull # again to sync w/ concurrent workflow updates
           git add .
           git commit -n -m "$ESCAPED_MSG ↞ [auto-sync from https://github.com/KudoAI/chatgpt.js]" || true
           git push
diff --git a/.github/workflows/sync-en-readme-changes.yml b/.github/workflows/sync-en-readme-changes.yml
@@ -53,6 +53,7 @@ jobs:
       - name: Push changes to KudoAI/chatgpt.js
         run: |
           cd ${{ github.workspace }}/KudoAI/chatgpt.js
+          git pull # again to sync w/ concurrent workflow updates
           git add .
           git commit -n -m "$ESCAPED_MSG ↞ [auto-sync from ${{ env.SYNC_SRC }}]" || true
           git push
diff --git a/.github/workflows/sync-greasemonkey-starter-changes.yml b/.github/workflows/sync-greasemonkey-starter-changes.yml
@@ -53,6 +53,7 @@ jobs:
       - name: Push changes to KudoAI/chatgpt.js-greasemonkey-starter
         run: |
           cd ${{ github.workspace }}/KudoAI/chatgpt.js-greasemonkey-starter
+          git pull # again to sync w/ concurrent workflow updates
           git add .
           git commit -n -m "$ESCAPED_MSG ↞ [auto-sync from https://github.com/KudoAI/chatgpt.js]" || true
           git push