ok this should do it

Pf2eToolsOrg · Jul 29, 2024 · c53b823 · c53b823
1 parent 5ccb7d0
commit c53b823
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -23,6 +23,17 @@ jobs:
     build-and-deploy:
         runs-on: ubuntu-latest
         steps:
+            - name: Update Cloudflare Branch
+              continue-on-error: true
+              run: |
+                git config --global user.name '${{ github.actor }}'
+                git config --global user.email '${{ github.actor }}@users.noreply.github.com'
+                git remote set-url origin "https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/$GITHUB_REPOSITORY"
+                git fetch origin "main"
+                git checkout main
+                git merge dev
+                git push
+
             - uses: actions/checkout@master
 
             - name: Clear caches
@@ -95,16 +106,6 @@ jobs:
             - name: Log In to Registry
               run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
-            - name: Update Cloudflare Branch
-              run: |
-                git config --global user.name '${{ github.actor }}'
-                git config --global user.email '${{ github.actor }}@users.noreply.github.com'
-                git remote set-url origin "https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/$GITHUB_REPOSITORY"
-                git fetch origin "main"
-                git checkout main
-                git merge dev
-                git push
-
             - name: Push Image
               run: |
                   IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME