Merge branch 'main' into patch-1

Author: cmwilson21

.github/workflows/automerge-dependencies.yml

@@ -68,13 +68,13 @@ jobs:
 
       # Because we get far too much spam ;_;
       - name: Lock conversations
-        uses: actions/github-script@2b34a689ec86a68d8ab9478298f91d5401337b7d
+        uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975
         env:
           PR_NUMBER: ${{ github.event.pull_request.number }}
         with:
           script: |
             try {
-              await github.issues.lock({
+              await github.rest.issues.lock({
                 ...context.repo,
                 issue_number: parseInt(process.env.PR_NUMBER, 10),
                 lock_reason: 'resolved'

.github/workflows/azure-preview-env-deploy.yml

@@ -113,7 +113,7 @@ jobs:
       - if: ${{ env.IS_INTERNAL_BUILD == 'true' }}
         name: Determine which docs-early-access branch to clone
         id: 'check-early-access'
-        uses: actions/github-script@2b34a689ec86a68d8ab9478298f91d5401337b7d
+        uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975
         env:
           BRANCH_NAME: ${{ env.BRANCH_NAME }}
         with:

.github/workflows/azure-prod-build-deploy.yml

@@ -97,7 +97,7 @@ jobs:
 
       # Watch canary slot instances to see when all the instances are ready
       - name: Check that canary slot is ready
-        uses: actions/github-script@2b34a689ec86a68d8ab9478298f91d5401337b7d
+        uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975
         env:
           CHECK_INTERVAL: 10000
         with:

.github/workflows/azure-staging-build-deploy.yml

@@ -110,7 +110,7 @@ jobs:
 
       # Watch deployment slot instances to see when all the instances are ready
       - name: Check that deployment slot is ready
-        uses: actions/github-script@2b34a689ec86a68d8ab9478298f91d5401337b7d
+        uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975
         env:
           CHECK_INTERVAL: 10000
         with:

.github/workflows/check-for-spammy-issues.yml

@@ -17,7 +17,7 @@ jobs:
     if: github.repository == 'github/docs'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@2b34a689ec86a68d8ab9478298f91d5401337b7d
+      - uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975
         with:
           github-token: ${{ secrets.DOCUBOT_READORG_REPO_WORKFLOW_SCOPES }}
           script: |
@@ -30,7 +30,7 @@ jobs:
             const titleWordCountMin = 3
 
             try {
-              await github.teams.getMembershipForUserInOrg({
+              await github.rest.teams.getMembershipForUserInOrg({
                 org: 'github',
                 team_slug: 'employees',
                 username: context.payload.sender.login,
@@ -54,7 +54,7 @@ jobs:
             //
 
             // Close the issue and add the invalid label
-            await github.issues.update({
+            await github.rest.issues.update({
               owner: owner,
               repo: repo,
               issue_number: issue.number,
@@ -63,7 +63,7 @@ jobs:
             });
 
             // Comment on the issue
-            await github.issues.createComment({
+            await github.rest.issues.createComment({
               owner: owner,
               repo: repo,
               issue_number: issue.number,
@@ -72,7 +72,7 @@ jobs:
 
             // Add the issue to the Done column on the triage board
             try {
-              await github.projects.createCard({
+              await github.rest.projects.createCard({
                 column_id: 11167427,
                 content_id: context.payload.issue.id,
                 content_type: "Issue"

.github/workflows/confirm-internal-staff-work-in-docs.yml

@@ -23,15 +23,15 @@ jobs:
     if: github.repository == 'github/docs' && github.actor != 'docs-bot'
     steps:
       - id: membership_check
-        uses: actions/github-script@2b34a689ec86a68d8ab9478298f91d5401337b7d
+        uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975
         env:
           TEAM_CONTENT_REPO: ${{ secrets.TEAM_CONTENT_REPO }}
         with:
           github-token: ${{ secrets.DOCUBOT_READORG_REPO_WORKFLOW_SCOPES }}
           script: |
             // Only perform this action with GitHub employees
             try {
-              await github.teams.getMembershipForUserInOrg({
+              await github.rest.teams.getMembershipForUserInOrg({
                 org: 'github',
                 team_slug: 'employees',
                 username: context.payload.sender.login,
@@ -45,7 +45,7 @@ jobs:
 
             // Don't perform this action with Docs team members
             try {
-              await github.teams.getMembershipForUserInOrg({
+              await github.rest.teams.getMembershipForUserInOrg({
                 org: 'github',
                 team_slug: 'docs',
                 username: context.payload.sender.login,
@@ -62,7 +62,7 @@ jobs:
             const issueNo = context.number || context.issue.number
 
             // Create an issue in our private repo
-            await github.issues.create({
+            await github.rest.issues.create({
               owner: 'github',
               repo: process.env.TEAM_CONTENT_REPO,
               title: `@${context.payload.sender.login} confirm that \#${issueNo} should be in the public github/docs repo`,

.github/workflows/content-changes-table-comment.yml

@@ -84,7 +84,7 @@ jobs:
 
       - name: Update comment
         if: ${{ steps.changes.outputs.changesTable != '' }}
-        uses: peter-evans/create-or-update-comment@c9fcb64660bc90ec1cc535646af190c992007c32
+        uses: peter-evans/create-or-update-comment@67dcc547d311b736a8e6c5c236542148a47adc3d
         with:
           comment-id: ${{ steps.findComment.outputs.comment-id }}
           issue-number: ${{ github.event.pull_request.number }}

.github/workflows/copy-api-issue-to-internal.yml

@@ -19,7 +19,7 @@ jobs:
     if: (github.event.label.name == 'rest-description' || github.event.label.name == 'graphql-description' || github.event.label.name == 'webhook-description') && github.repository == 'github/docs'
     steps:
       - name: Check if this run was triggered by a member of the docs team
-        uses: actions/github-script@2b34a689ec86a68d8ab9478298f91d5401337b7d
+        uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975
         id: triggered-by-member
         with:
           github-token: ${{secrets.DOCUBOT_READORG_REPO_WORKFLOW_SCOPES}}

.github/workflows/first-responder-docs-content.yml

@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Check if the event originated from a team member
-        uses: actions/github-script@2b34a689ec86a68d8ab9478298f91d5401337b7d
+        uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975
         id: set-result
         with:
           github-token: ${{secrets.DOCUBOT_READORG_REPO_WORKFLOW_SCOPES}}
@@ -33,7 +33,7 @@ jobs:
             const repoName = context.payload.repository.name
             const ownerName = context.payload.repository.owner.login
             const issueNumber = (context.eventName === "issues") ? context.payload.issue.number : context.payload.number
-            const updatedIssueInformation = await github.issues.get({
+            const updatedIssueInformation = await github.rest.issues.get({
               owner: ownerName,
               repo: repoName,
               issue_number: issueNumber
@@ -71,20 +71,20 @@ jobs:
 
     steps:
       - name: Remove card from project
-        uses: actions/github-script@2b34a689ec86a68d8ab9478298f91d5401337b7d
+        uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975
         with:
           github-token: ${{secrets.DOCUBOT_READORG_REPO_WORKFLOW_SCOPES}}
           result-encoding: string
           script: |
             const issueToRemove = context.payload.number
-            const cards = await github.projects.listCards({
+            const cards = await github.rest.projects.listCards({
               column_id: 11130889
             })
             cards.data.forEach(card => {
               if (card.content_url) {
                 const cardIssueNumber = parseInt(card.content_url.split('/').pop(), 10)
                 if (cardIssueNumber === issueToRemove) {
-                  const cards = github.projects.deleteCard({
+                  const cards = github.rest.projects.deleteCard({
                     card_id: card.id
                   })
                 }

.github/workflows/hubber-contribution-help.yml

@@ -21,12 +21,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - id: membership_check
-        uses: actions/github-script@2b34a689ec86a68d8ab9478298f91d5401337b7d
+        uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975
         with:
           github-token: ${{ secrets.DOCUBOT_READORG_REPO_WORKFLOW_SCOPES }}
           script: |
             try {
-              await github.teams.getMembershipForUserInOrg({
+              await github.rest.teams.getMembershipForUserInOrg({
                 org: 'github',
                 team_slug: 'docs',
                 username: context.payload.sender.login,