November 1st, 2025 Update

.github/workflows/schedule_update.yaml

@@ -9,6 +9,7 @@ on:
 
 env:
   BRANCH: FrogPilot-Staging
+  GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
 
 jobs:
   schedule-update:
@@ -22,6 +23,7 @@ jobs:
       - name: Checkout ${{ env.BRANCH }}
         uses: actions/checkout@v3
         with:
+          persist-credentials: false
           ref: ${{ env.BRANCH }}
           fetch-depth: 3
 
@@ -42,16 +44,30 @@ jobs:
           echo "COMMITTER_DATE=$COMMITTER_DATE" >> $GITHUB_ENV
           echo "TARGET_COMMIT=$TARGET_COMMIT" >> $GITHUB_ENV
 
-      - name: Create Fixup Commit for ${{ env.TARGET_COMMIT }}
-        run: git commit --fixup="${{ env.TARGET_COMMIT }}"
+      - name: Create Fixup Commit if Changes Exist
+        id: fixup_commit
+        run: |
+          if git diff --cached --quiet; then
+            echo "No changes to commit."
+            echo "has_changes=false" >> "$GITHUB_OUTPUT"
+          else
+            echo "Changes found, creating fixup commit."
+            git commit --fixup="${{ env.TARGET_COMMIT }}"
+            echo "has_changes=true" >> "$GITHUB_OUTPUT"
+          fi
 
       - name: Autosquash Fixup into Target Commit
+        if: steps.fixup_commit.outputs.has_changes == 'true'
         run: |
           GIT_SEQUENCE_EDITOR=: git rebase --autosquash -i HEAD~3
 
       - name: Restore Timestamps on Final Two Commits
+        if: steps.fixup_commit.outputs.has_changes == 'true'
         run: |
           git rebase --exec "GIT_COMMITTER_DATE='${{ env.COMMITTER_DATE }}' git commit --amend --no-edit --date='${{ env.AUTHOR_DATE }}'" HEAD~2
 
       - name: Push Updated ${{ env.BRANCH }} Branch
-        run: git push origin "${{ env.BRANCH }}" --force-with-lease
+        if: steps.fixup_commit.outputs.has_changes == 'true'
+        run: |
+          git remote set-url origin https://x-access-token:${GITHUB_TOKEN}@github.com/${{ github.repository }}
+          git push origin "${{ env.BRANCH }}" --force-with-lease

.github/workflows/update_pr_branch.yaml

@@ -3,12 +3,12 @@ name: Update MAKE-PRS-HERE
 on:
   push:
     branches:
-      - FrogPilot-Staging
+      - FrogPilot-Testing
 
 env:
   GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
 
-  SOURCE_BRANCH: FrogPilot-Staging
+  SOURCE_BRANCH: FrogPilot-Testing
   TARGET_BRANCH: MAKE-PRS-HERE
 
 jobs: