Update GHA tokens and output (#951) (#952)

Author: recrwplay

.github/workflows/docs-deploy-surge.yml

@@ -45,23 +45,27 @@ jobs:
       - id: get-deploy-id
         run: |
           deployid=$(<deployid)
-          echo "::set-output name=deploy-id::$deployid"
+          case "$deployid" in ''|*[!0-9]*) echo "Provided PR number is not an integer"; exit 1 ;; esac
+          echo "deploy-id=$deployid" >> "$GITHUB_OUTPUT"
       
       - uses: actions/setup-node@v3
         with:
           node-version: lts/*
 
       - name: Deploy docs to surge
+        shell: bash
+        env:
+          SURGE_TOKEN: "${{ secrets.DOCS_SURGE_TOKEN }}"
         run: |
           npm install -g surge
-          surge ./site ${{ github.event.repository.owner.login}}-${{ github.event.repository.name}}-${{ steps.get-deploy-id.outputs.deploy-id }}.surge.sh --token ${{ secrets.SURGE_TOKEN }}
+          surge ./site ${{ github.event.repository.owner.login}}-${{ github.event.repository.name}}-${{ steps.get-deploy-id.outputs.deploy-id }}.surge.sh --token "$SURGE_TOKEN"
 
       - name: Comment on PR
         uses: marocchino/sticky-pull-request-comment@v2
         with:
           number: ${{ steps.get-deploy-id.outputs.deploy-id }}
           message: |
-            Looks like you've updated the documentation!
+            This PR includes documentation updates.
 
-            Check out your changes at https://${{ github.event.repository.owner.login}}-${{ github.event.repository.name}}-${{ steps.get-deploy-id.outputs.deploy-id }}.surge.sh
-          GITHUB_TOKEN: ${{ secrets.PR_COMMENT_TOKEN }}
+            You can view the updated docs at https://${{ github.event.repository.owner.login}}-${{ github.event.repository.name}}-${{ steps.get-deploy-id.outputs.deploy-id }}.surge.sh
+          GITHUB_TOKEN: ${{ secrets.DOCS_PR_COMMENT_TOKEN }}

.github/workflows/docs-pr.yml

@@ -7,8 +7,7 @@ name: "Verify PR"
 on:
   pull_request:
     branches:
-    - "4.4"
-    - "5.0"
+    - "4.[0-9]"
     - "5.x"
     - "dev"
 

.github/workflows/docs-teardown.yml

@@ -4,8 +4,7 @@ name: "Documentation Teardown"
 on:
   pull_request_target:
     branches:
-      - "4.4"
-      - "5.0"
+      - "4.[0-9]"
       - "5.x"
       - "dev"
     types:
@@ -20,7 +19,19 @@ jobs:
         with:
           node-version: lts/*
       - name: Teardown documentation
+        shell: bash
+        env:
+          SURGE_TOKEN: "${{ secrets.DOCS_SURGE_TOKEN }}"
         run: |
           npm install -g surge
-          surge teardown ${{ github.event.repository.owner.login}}-${{ github.event.repository.name}}-${{ github.event.pull_request.number }}.surge.sh --token ${{ secrets.SURGE_TOKEN }}
-          
+          surge teardown ${{ github.event.repository.owner.login}}-${{ github.event.repository.name}}-${{ github.event.pull_request.number }}.surge.sh --token "$SURGE_TOKEN"
+      - name: Comment on PR
+        uses: marocchino/sticky-pull-request-comment@v2
+        with:
+          number: ${{ github.event.pull_request.number }}
+          message: |
+            Thanks for the documentation updates.
+
+            The preview documentation has now been torn down - reopening this PR will republish it.
+          GITHUB_TOKEN: ${{ secrets.DOCS_PR_COMMENT_TOKEN }}
+