Merge branch 'github:main' into main

Author: Mhmonicox

.github/actions-scripts/enterprise-server-issue-templates/deprecation-issue.md

@@ -158,8 +158,8 @@ For each language, upload the new file to Azure blob storage in the `enterprise`
 
 After uploading the new files, you will need to purge the Fastly cache for the single page. From Okta, go to Fastly and select `docs`. Click `Purge` then `Purge URL`. If you need to purge a whole path, just do a `Purge All`
 
-![](/assets/images/fastly_purge.jpg)
+![](/contributing/images/fastly_purge.jpg)
 
 Enter the URL or path and do a soft purge.
 
-![](/assets/images/fastly_purge_url.jpg)
+![](/contributing/images/fastly_purge_url.jpg)

.github/actions/get-docs-early-access/action.yml

@@ -0,0 +1,33 @@
+name: Clone and add docs-early-access
+
+description: Clone docs-early-access and copy its content into the repo
+
+inputs:
+  token:
+    description: PAT
+    required: true
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Figure out which branch to checkout
+      id: check-early-access
+      env:
+        BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
+        GITHUB_TOKEN: ${{ inputs.token }}
+      shell: bash
+      run: node .github/actions-scripts/what-docs-early-access-branch.js
+
+    - name: Clone
+      uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+      with:
+        repository: github/docs-early-access
+        token: ${{ inputs.token }}
+        path: docs-early-access
+        ref: ${{ steps.check-early-access.outputs.branch }}
+
+    - name: Merge docs-early-access repo's folders
+      shell: bash
+      run: |
+        .github/actions-scripts/merge-early-access.sh
+        rm -fr docs-early-access

.github/actions/node-npm-setup/action.yml

@@ -15,7 +15,7 @@ runs:
     - name: Setup Node.js
       uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516
       with:
-        node-version-file: '.node-version'
+        node-version-file: 'package.json'
         cache: npm
 
     - name: Install dependencies

.github/workflows/automerge-dependencies.yml renamed to .github/workflows/auto-close-dependencies.yml

@@ -1,10 +1,8 @@
-name: Auto Merge Dependency Updates
+name: Auto Close Open Source Dependency Updates
 
 # **What it does**:
-#  - automerge-internal: Automatically merge dependabot's pull requests in the internal repository.
 #  - close-external: Automatically close dependabot's pull requests in the open-source repository.
 # **Why we have it**:
-#  - automerge-internal: To keep our dependencies up-to-date, to avoid security issues.
 #  - close-external: To avoid duplicating updates against the internal repository.
 # **Who does it impact**: It helps docs engineering focus on higher value work.
 
@@ -25,22 +23,6 @@ permissions:
   pull-requests: write
 
 jobs:
-  automerge-internal:
-    if: >-
-      ${{
-        github.repository == 'github/docs-internal' &&
-        github.event.pull_request.number &&
-        github.event.pull_request.base.ref == 'main' &&
-        github.event.pull_request.user.login == 'dependabot[bot]' &&
-        github.event.pull_request.state == 'open'
-      }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: tjenkinson/gh-action-auto-merge-dependency-updates@c47f6255e06f36e84201ee940466e731ffa6e885
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          allowed-actors: dependabot[bot]
-
   close-external:
     if: >-
       ${{

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

@@ -201,7 +201,7 @@ jobs:
       # Deploy ARM template is idempotent
       # Note: once the resources exist the image tag must change for a new deployment to occur (the image tag includes workflow run number, run attempt, as well as sha)
       - name: Run ARM deploy
-        uses: azure/arm-deploy@841b12551939c88af8f6df767c24c38a5620fd0d
+        uses: azure/arm-deploy@65ae74fb7aec7c680c88ef456811f353adae4d06
         with:
           resourceGroupName: ${{ secrets.PREVIEW_ENV_RESOURCE_GROUP }}
           subscriptionId: ${{ secrets.NONPROD_SUBSCRIPTION_ID }}

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

@@ -58,7 +58,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516
         with:
-          node-version-file: '.node-version'
+          node-version-file: 'package.json'
           cache: npm
 
       - name: Clone docs-early-access

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

@@ -76,7 +76,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516
         with:
-          node-version-file: '.node-version'
+          node-version-file: 'package.json'
           cache: npm
 
       - name: Clone docs-early-access

.github/workflows/browser-test.yml

@@ -54,7 +54,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516
         with:
-          node-version-file: '.node-version'
+          node-version-file: 'package.json'
           cache: npm
 
       - name: Install dependencies
@@ -65,6 +65,11 @@ jobs:
           PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: true
         run: npm ci --include=optional
 
+      - uses: ./.github/actions/get-docs-early-access
+        if: ${{ github.repository == 'github/docs-internal' }}
+        with:
+          token: ${{ secrets.DOCUBOT_REPO_PAT }}
+
       - name: Cache nextjs build
         uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7
         with:

.github/workflows/check-broken-links-github-github.yml

@@ -44,18 +44,11 @@ jobs:
           # To prevent issues with cloning early access content later
           persist-credentials: 'false'
 
-      - name: Clone docs-early-access
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+      - uses: ./.github/actions/node-npm-setup
+
+      - uses: ./.github/actions/get-docs-early-access
         with:
-          repository: github/docs-early-access
           token: ${{ secrets.DOCUBOT_REPO_PAT }}
-          path: docs-early-access
-          ref: main
-
-      - name: Merge docs-early-access repo's folders
-        run: .github/actions-scripts/merge-early-access.sh
-
-      - uses: ./.github/actions/node-npm-setup
 
       - name: Build server
         run: npm run build

.github/workflows/codeql.yml

@@ -31,8 +31,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
-      - uses: github/codeql-action/init@1ed1437484560351c5be56cf73a48a279d116b78
+      - uses: github/codeql-action/init@32dc499307d133bb5085bae78498c0ac2cf762d5
         with:
           languages: javascript # comma separated list of values from {go, python, javascript, java, cpp, csharp, ruby}
-      - uses: github/codeql-action/analyze@1ed1437484560351c5be56cf73a48a279d116b78
+      - uses: github/codeql-action/analyze@32dc499307d133bb5085bae78498c0ac2cf762d5
         continue-on-error: true