Refactor notebook rendering workflow

Updated workflow to render notebooks for GitHub, added checks for changes, and improved Python version specification.

Author: brown9804

.github/workflows/render-notebooks.yml

@@ -1,12 +1,12 @@
-name: Render for GitHub
+name: Render Notebooks for GitHub
 
 on:
-  pull_request:
-    branches:
-      - main
   push:
     paths:
       - '**.ipynb'
+  pull_request:
+    branches:
+      - main
   workflow_dispatch:  # Allows manual triggering
 
 permissions:
@@ -22,39 +22,46 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          ref: ${{ github.head_ref || github.ref_name }}  # Explicitly checkout the branch that triggered the workflow
 
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.x'
+          python-version: '3.10'
 
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           pip install nbformat nbconvert jupyter
 
-      - name: Configure Git 
+      - name: Run conversion script
+        run: python .github/workflows/convert_notebooks.py
+
+      - name: Configure Git
         run: |
           git config --global user.email "github-actions[bot]@users.noreply.github.com"
           git config --global user.name "github-actions[bot]"
 
-      - name: Render notebooks for GitHub
-        run: python .github/workflows/render_notebooks.py
-
-      - name: Commit changes
-        env:
-          TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Check for changes
+        id: git-check
         run: |
-          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
-            git fetch origin ${{ github.event.pull_request.head.ref }}
-            git pull --rebase origin ${{ github.event.pull_request.head.ref }} || echo "No rebase needed"
-            git add "**/*.ipynb"
-            git commit -m "Render notebooks for GitHub compatibility" || echo "No changes to commit"
-            git remote set-url origin https://x-access-token:${TOKEN}@github.com/${{ github.repository }}
-            git push origin HEAD:${{ github.event.pull_request.head.ref }}
+          if [[ -n "$(git status --porcelain **/*.ipynb)" ]]; then
+            echo "has_changes=true" >> $GITHUB_OUTPUT
           else
-            git add "**/*.ipynb"
-            git commit -m "Render notebooks for GitHub compatibility" || echo "No changes to commit"
-            git remote set-url origin https://x-access-token:${TOKEN}@github.com/${{ github.repository }}
-            git push origin ${{ github.ref_name }}
+            echo "has_changes=false" >> $GITHUB_OUTPUT
           fi
+
+      - name: Show modified files
+        if: steps.git-check.outputs.has_changes == 'true'
+        run: git status
+
+      - name: Commit and push changes to current branch
+        if: steps.git-check.outputs.has_changes == 'true'
+        run: |
+          CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+          echo "Current branch: $CURRENT_BRANCH"
+          
+          # Add, commit, and push changes
+          git add "**/*.ipynb"
+          git commit -m "Render notebooks for GitHub compatibility"
+          git push https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git HEAD:${CURRENT_BRANCH}