Merge branch 'master' into redist-update/server-preview-publicized-20250908-213628

Author: sunnamed434

.github/workflows/Verify.Redist.Update.yaml

@@ -131,15 +131,15 @@ jobs:
           fi
 
       - name: Enable PR automerge
-        if: success() && env.ALLOW_AUTO_MERGE_REDIST_PR == 'true' && github.actor == 'rocketmodfixadmin'
+        if: success() && env.ALLOW_AUTO_MERGE_REDIST_PR == 'true' && github.triggering_actor == 'rocketmodfixadmin'
         uses: peter-evans/enable-pull-request-automerge@v3
         with:
           token: ${{ secrets.PAT }}
           pull-request-number: ${{ github.event.pull_request.number }}
           merge-method: squash
 
       - name: Auto-approve PR
-        if: success() && env.ALLOW_AUTO_MERGE_REDIST_PR == 'true' && github.actor == 'rocketmodfixadmin'
+        if: success() && env.ALLOW_AUTO_MERGE_REDIST_PR == 'true' && github.triggering_actor == 'rocketmodfixadmin'
         uses: hmarr/auto-approve-action@v4
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}