Merge branch 'main' into patch-1

Author: janiceilene

.all-contributorsrc

@@ -312,6 +312,50 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "casals",
+      "name": "Arthur Casals",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/785860?v=4",
+      "profile": "https://github.com/casals",
+      "contributions": [
+        "content",
+        "doc"
+      ]
+    },
+    {
+      "login": "Simran-B",
+      "name": "Simran",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/7819991?v=4",
+      "profile": "https://www.arangodb.com/",
+      ]
+    },
+    {
+      "login": "Ruth",
+      "name": "Ruth",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/85029?v=4",
+      "profile": "https://github.com/ruth",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "wi5nia",
+      "name": "Tomasz Wisniewski",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/12593852?v=4",
+      "profile": "http://tomaszwisniewski.com",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "chiedo",
+      "name": "Chiedo John",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/2156688?v=4",
+      "profile": "https://chiedojohn.com/",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/CODEOWNERS

@@ -14,3 +14,7 @@ package-lock.json @github/docs-engineering
 package.json @github/docs-engineering
 
 /content/github/site-policy/ @github/site-policy-admins
+
+# Make sure that Octokit maintainers get notified about changes
+# relevant to the Octokit libraries (https://github.com/octokit)
+/content/rest/reference @github/octokit-maintainers

.github/allowed-actions.js

@@ -23,7 +23,7 @@ module.exports = [
   'juliangruber/approve-pull-request-action@v1',
   'juliangruber/find-pull-request-action@v1',
   'juliangruber/read-file-action@v1',
-  'pascalgn/automerge-action@135f0bdb927d9807b5446f7ca9ecc2c51de03c4a',
+  'pascalgn/automerge-action@c9bd182',
   'peter-evans/create-issue-from-file@v2',
   'peter-evans/create-pull-request@v2',
   'rachmari/actions-add-new-issue-to-column@v1.1.1',

.github/workflows/automerge.yml

@@ -20,18 +20,17 @@ on:
 jobs:
   automerge:
     runs-on: ubuntu-latest
-    if: contains(github.event.pull_request.labels.*.name, 'automerge')
+    if: contains(github.event.pull_request.labels.*.name, 'automerge') || contains(github.event.pull_request.labels.*.name, 'autosquash')
     steps:
       - name: automerge
-        uses: "pascalgn/automerge-action@135f0bdb927d9807b5446f7ca9ecc2c51de03c4a"
+        uses: "pascalgn/automerge-action@c9bd182"
         env:
           GITHUB_TOKEN: "${{ secrets.OCTOMERGER_PAT_WITH_REPO_AND_WORKFLOW_SCOPE }}"
-          MERGE_LABELS: "automerge"
-          MERGE_REMOVE_LABELS: ""
+          MERGE_METHOD_LABELS: "automerge=merge,autosquash=squash"
           MERGE_COMMIT_MESSAGE: "pull-request-title"
           MERGE_METHOD: "merge"
           MERGE_FORKS: "true"
           MERGE_RETRIES: "50"
-          MERGE_RETRY_SLEEP: "10000"
-          UPDATE_LABELS: "automerge"
+          MERGE_RETRY_SLEEP: "10000" # ten seconds
+          UPDATE_LABELS: "automerge,autosquash"
           UPDATE_METHOD: "merge"

.github/workflows/autosquash.yml

@@ -6,7 +6,6 @@ on:
 
 jobs:
   triage:
-    if: github.repository == 'github/docs-internal'
     runs-on: ubuntu-latest
     continue-on-error: true
     env:
@@ -15,6 +14,7 @@ jobs:
     steps:
     - name: 
       uses: actions/github-script@v2
+      continue-on-error: true
       with:
           github-token: ${{ secrets.DOCUBOT_FR_PROJECT_BOARD_WORKFLOWS_REPO_ORG_READ_SCOPES }}
           script: |

.github/workflows/start-new-engineering-pr-workflow.yml

@@ -3,6 +3,7 @@
 name: Node.js Tests - Windows
 
 on:
+  workflow_dispatch:
   schedule:
     - cron: "50 19 * * *" # once a day at 19:50 UTC / 11:50 PST
 
@@ -44,7 +45,6 @@ jobs:
         run: npm run check-deps
 
   test:
-    if: github.repository == 'github/docs-internal'
     runs-on: windows-latest
     strategy:
       fail-fast: false