Merge branch 'github:main' into main

.github/actions-scripts/test-local-dev.js

@@ -125,9 +125,9 @@ async function testSiteSearch() {
     assert(/[\d,]+ Search results for "github"/.test($('h1').text()))
     assert($('[data-testid="search-result"]').length > 0)
   }
-  // Find 0 things on enterprise-server@latest
+  // Find 0 things on enterprise-cloud@latest
   {
-    const res = await get('/en/enterprise-server@latest/search?query=gobligook')
+    const res = await get('/en/enterprise-cloud@latest/search?query=gobligook')
     const $ = cheerio.load(res.body)
     assert(/0 Search results for "gobligook"/.test($('h1').text()))
     assert($('[data-testid="search-result"]').length === 0)

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

@@ -44,7 +44,7 @@ permissions:
 
 # This allows one deploy workflow to interrupt another
 concurrency:
-  group: 'preview-env @ ${{ github.head_ref || github.run_id }} for ${{ github.event.number || github.event.inputs.PR_NUMBER }}'
+  group: 'preview-env @ ${{ github.head_ref || github.run_id }} for ${{ github.event.number || inputs.PR_NUMBER }}'
   cancel-in-progress: true
 
 jobs:
@@ -56,8 +56,8 @@ jobs:
     # See https://bit.ly/3qB9nZW > If a job in a workflow is skipped due to a conditional, it will report its status as "Success".
     if: |
       (
-        (github.event.pull_request.head.sha || github.event.inputs.COMMIT_REF)
-         && (github.event.number || github.event.inputs.PR_NUMBER || github.run_id)
+        (github.event.pull_request.head.sha || inputs.COMMIT_REF)
+         && (github.event.number || inputs.PR_NUMBER || github.run_id)
        )
        && (github.repository == 'github/docs-internal' || github.repository == 'github/docs')
        &&  github.actor != 'dependabot[bot]'
@@ -70,8 +70,8 @@ jobs:
       # to link a PR to a list of environments later.
       url: ${{ env.APP_URL }}
     env:
-      PR_NUMBER: ${{ github.event.number || github.event.inputs.PR_NUMBER || github.run_id }}
-      COMMIT_REF: ${{ github.event.pull_request.head.sha || github.event.inputs.COMMIT_REF }}
+      PR_NUMBER: ${{ github.event.number || inputs.PR_NUMBER || github.run_id }}
+      COMMIT_REF: ${{ github.event.pull_request.head.sha || inputs.COMMIT_REF }}
       BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
       IS_INTERNAL_BUILD: ${{ github.repository == 'github/docs-internal' }}
       # This may also run in forked repositories, not just 'github/docs'

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

@@ -21,7 +21,7 @@ permissions:
 
 # This allows one deploy workflow to interrupt another
 concurrency:
-  group: 'preview-env @ ${{ github.head_ref || github.run_id }} for ${{ github.event.number || github.event.inputs.PR_NUMBER }}'
+  group: 'preview-env @ ${{ github.head_ref || github.run_id }} for ${{ github.event.number || inputs.PR_NUMBER }}'
   cancel-in-progress: true
 
 jobs:
@@ -31,7 +31,7 @@ jobs:
     if: github.repository == 'github/docs-internal' || github.repository == 'github/docs'
     timeout-minutes: 5
     env:
-      PR_NUMBER: ${{ github.event.number || github.event.inputs.PR_NUMBER }}
+      PR_NUMBER: ${{ github.event.number || inputs.PR_NUMBER }}
 
     steps:
       - name: 'Az CLI login'

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

@@ -23,7 +23,7 @@ permissions:
 # This allows a subsequently queued workflow run to take priority over
 # previously queued runs but NOT interrupt currently executing runs
 concurrency:
-  group: 'staging-env @ ${{ github.head_ref || github.run_id }} for ${{ github.event.number || github.event.inputs.PR_NUMBER }}'
+  group: 'staging-env @ ${{ github.head_ref || github.run_id }} for ${{ github.event.number || inputs.PR_NUMBER }}'
   cancel-in-progress: true
 
 jobs:
@@ -36,9 +36,9 @@ jobs:
       name: staging-env
       url: ${{ env.APP_URL }}
     env:
-      PR_NUMBER: ${{ github.event.number || github.event.inputs.PR_NUMBER || github.run_id }}
-      COMMIT_REF: ${{ github.event.pull_request.head.sha || github.event.inputs.COMMIT_REF }}
-      IMAGE_REPO: ${{ github.repository }}/pr-${{ github.event.number || github.event.inputs.PR_NUMBER || github.run_id }}
+      PR_NUMBER: ${{ github.event.number || inputs.PR_NUMBER || github.run_id }}
+      COMMIT_REF: ${{ github.event.pull_request.head.sha || inputs.COMMIT_REF }}
+      IMAGE_REPO: ${{ github.repository }}/pr-${{ github.event.number || inputs.PR_NUMBER || github.run_id }}
       RESOURCE_GROUP_NAME: docs-staging
       APP_SERVICE_NAME: ghdocs-staging
       SLOT_NAME: canary

.github/workflows/codeowners-docs-engineering.yml

@@ -27,7 +27,11 @@ on:
 
 jobs:
   codeowners-docs-engineering:
-    if: ${{ github.repository == 'github/docs-internal' && !github.event.pull_request.draft }}
+    if: >-
+      ${{ github.repository == 'github/docs-internal' &&
+          !github.event.pull_request.draft &&
+          !contains(github.event.pull_request.labels.*.name, 'engineering') &&
+          github.event.pull_request.head.ref != 'repo-sync' }}
     runs-on: ubuntu-latest
     env:
       GH_TOKEN: ${{ secrets.DOCS_BOT_PAT_WRITEORG_PROJECT }}

.github/workflows/purge-fastly.yml

@@ -39,11 +39,11 @@ jobs:
       - uses: ./.github/actions/node-npm-setup
 
       - name: Purge Fastly edge cache independent of language
-        if: ${{ github.event.inputs.nuke_all }}
+        if: ${{ inputs.nuke_all }}
         run: .github/actions-scripts/purge-fastly-edge-cache.js
 
       - name: Purge Fastly edge cache per language
-        if: ${{ !github.event.inputs.nuke_all }}
+        if: ${{ !inputs.nuke_all }}
         env:
-          LANGUAGES: ${{ github.event.inputs.languages }}
+          LANGUAGES: ${{ inputs.languages }}
         run: .github/actions-scripts/purge-fastly-edge-cache-per-language.js

.github/workflows/sync-codeql-cli.yml

@@ -46,7 +46,7 @@ jobs:
           token: ${{ secrets.DOCS_BOT_PAT_WRITEORG_PROJECT }}
           repository: github/semmle-code
           path: semmle-code
-          ref: ${{ github.event.inputs.SOURCE_BRANCH }}
+          ref: ${{ inputs.SOURCE_BRANCH }}
 
       - uses: ./.github/actions/node-npm-setup
 

.github/workflows/sync-openapi.yml

@@ -45,7 +45,7 @@ jobs:
           # will be checked out
           repository: github/rest-api-description
           path: rest-api-description
-          ref: ${{ github.event.inputs.SOURCE_BRANCH }}
+          ref: ${{ inputs.SOURCE_BRANCH }}
 
       - uses: ./.github/actions/node-npm-setup
 

.github/workflows/sync-search-elasticsearch.yml

@@ -166,7 +166,7 @@ jobs:
 
           # Note that by default, this is '' (empty string) and that means
           # the same as not set within the script.
-          VERSION: ${{ github.event.inputs.version }}
+          VERSION: ${{ inputs.version }}
 
           # The sync-search-index recognizes this env var if you don't
           # use the `--popular-pags <PATH>` option.
@@ -188,7 +188,7 @@ jobs:
           # Must match what we used when scraping (npm run sync-search-indices)
           # otherwise the script will seek other versions from disk that might
           # not exist.
-          VERSION: ${{ github.event.inputs.version }}
+          VERSION: ${{ inputs.version }}
         run: |
           ./src/search/scripts/index-elasticsearch.js /tmp/records \
             --language ${{ matrix.language }} \

.github/workflows/test.yml

@@ -42,7 +42,6 @@ jobs:
             return [
               { name: 'automated-pipelines', path: 'src/automated-pipelines/tests', },
               { name: 'content', path: 'tests/content', },
-              // { name: 'content-linter', path: 'src/content-linter/tests', },
               { name: 'content-render', path: 'src/content-render/tests', },
               { name: 'events', path: 'src/events/tests', },
               { name: 'ghes-releases', path: 'src/ghes-releases/tests', },
@@ -180,6 +179,6 @@ jobs:
           # tests run only in English. The exception is the
           # `tests/translations/` suite which needs all languages to be set up.
           ENABLED_LANGUAGES: ${{ matrix.name == 'translations' && 'all' || '' }}
-          ROOT: ${{ (matrix.name == 'rendering-fixtures' || matrix.name == 'pageinfo') && 'tests/fixtures' || '' }}
+          ROOT: ${{ (matrix.name == 'rendering-fixtures' || matrix.name == 'pageinfo' || matrix.name == 'landings' ) && 'tests/fixtures' || '' }}
           TRANSLATIONS_FIXTURE_ROOT: ${{ (matrix.name == 'rendering-fixtures' || matrix.name == 'pageinfo') && 'tests/fixtures/translations' || '' }}
         run: npm test -- ${{ matrix.path }}/