Update deploy.yml

Author: rkdan

.github/workflows/deploy.yml

@@ -33,6 +33,18 @@ jobs:
       - name: Build the MkDocs site
         run: mkdocs build
 
+      - name: Check if gh-pages branch exists
+        id: check_branch
+        run: |
+          if git ls-remote --heads origin gh-pages | grep -q 'refs/heads/gh-pages'; then
+            echo "Branch exists"
+            echo "branch_exists=true" >> $GITHUB_OUTPUT
+          else
+            echo "Branch does not exist"
+            echo "branch_exists=false" >> $GITHUB_OUTPUT
+          fi
+      
+
       - name: Generate GitHub App token
         id: generate_token
         uses: tibdex/github-app-token@v1
@@ -47,22 +59,6 @@ jobs:
           git config --global user.email 'github-actions[bot]@users.noreply.github.com'
           git clone --branch ${{ env.DOCS_BRANCH }} https://x-access-token:${{ steps.generate_token.outputs.token }}@github.com/acceleratescience/resource-hub.git temp_docs
 
-      # - name: Deploy to Documentation Repo
-      #   run: |
-      #     # Ensure the target directory exists
-      #     mkdir -p temp_docs/${{ env.DOCS_SUBDIR }}
-          
-      #     # Sync the built site to the target directory
-      #     rsync -av --delete ${{ env.MKDOCS_SITE_DIR }}/ temp_docs/${{ env.DOCS_SUBDIR }}/
-          
-      #     # Commit and push changes
-      #     cd temp_docs
-      #     git add .
-      #     git diff-index --quiet HEAD || (git stash && git pull --rebase origin ${{ env.DOCS_BRANCH }} && git stash pop)
-      #     git add .
-      #     git diff-index --quiet HEAD || git commit -m "Update ${{ env.DOCS_SUBDIR }} workshops"
-      #     git push origin ${{ env.DOCS_BRANCH }}
-
       - name: Deploy to Documentation Repo
         run: |
           # Ensure the target directory exists
@@ -74,51 +70,10 @@ jobs:
           # Commit and push changes
           cd temp_docs
           git add .
-          
-          # Try to pull and push multiple times
-          max_attempts=5
-          attempt=1
-          while [ $attempt -le $max_attempts ]; do
-            echo "Attempt $attempt of $max_attempts"
-            
-            # Stash any changes
-            git stash
-            
-            # Pull with rebase
-            if git pull --rebase origin ${{ env.DOCS_BRANCH }}; then
-              # If pull successful, apply stashed changes
-              git stash pop
-            else
-              echo "Pull failed, retrying..."
-              git stash drop
-              attempt=$((attempt+1))
-              sleep 5
-              continue
-            fi
-            
-            # Check for changes
-            if git diff-index --quiet HEAD; then
-              echo "No changes to commit"
-              exit 0
-            fi
-            
-            # Commit changes
-            git add .
-            git commit -m "Update ${{ env.DOCS_SUBDIR }} resource-hub"
-            
-            # Try to push
-            if git push origin ${{ env.DOCS_BRANCH }}; then
-              echo "Push successful"
-              exit 0
-            else
-              echo "Push failed, retrying..."
-              attempt=$((attempt+1))
-              sleep 5
-            fi
-          done
-          
-          echo "Failed to push after $max_attempts attempts"
-          exit 1
+          git diff-index --quiet HEAD || (git stash && git pull --rebase origin ${{ env.DOCS_BRANCH }} && git stash pop)
+          git add .
+          git diff-index --quiet HEAD || git commit -m "Update ${{ env.DOCS_SUBDIR }} resource-hub"
+          git push origin ${{ env.DOCS_BRANCH }}
 
       - name: Clean up
         if: always()