Merge branch 'main' into main

Author: manupk

.github/actions/labeler/labeler.ts

@@ -1,6 +1,6 @@
 /* See function main in this file for documentation */
 
-import coreLib from '@actions/core'
+import * as coreLib from '@actions/core'
 import { type Octokit } from '@octokit/rest'
 import { CoreInject } from '@/links/scripts/action-injections'
 

.github/instructions/all.instructions.md

@@ -44,10 +44,9 @@ jobs:
           PORT: 4000
           ENABLED_LANGUAGES: en
         run: |
-
-          npm run start &
+          npm run start-for-ci &
           sleep 5
-          curl --retry-connrefused --retry 3 -I http://localhost:4000/
+          curl --retry-connrefused --retry 5 -I http://localhost:4000/
 
       - name: Run broken github/github link check
         run: |

.github/instructions/code.instructions.md

@@ -230,21 +230,64 @@ jobs:
           FASTLY_SURROGATE_KEY: api-search:${{ matrix.language }}
         run: npm run purge-fastly-edge-cache
 
-      - name: Alert on scraping failures
-        if: ${{ steps.check-failures.outputs.has_failures == 'true' && github.event_name != 'workflow_dispatch' }}
-        uses: ./.github/actions/slack-alert
+      - name: Upload failures artifact
+        if: ${{ steps.check-failures.outputs.has_failures == 'true' }}
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: search-failures-${{ matrix.language }}
+          path: /tmp/records/failures-summary.json
+          retention-days: 1
+
+      - uses: ./.github/actions/slack-alert
+        if: ${{ failure() && github.event_name != 'workflow_dispatch' }}
         with:
           slack_channel_id: ${{ secrets.DOCS_ALERTS_SLACK_CHANNEL_ID }}
           slack_token: ${{ secrets.SLACK_DOCS_BOT_TOKEN }}
-          message: |
-            :warning: ${{ steps.check-failures.outputs.failed_pages }} page(s) failed to scrape for general search indexing (language: ${{ matrix.language }})
 
-            The indexing completed but some pages could not be scraped. This may affect search results for those pages.
+  notifyScrapingFailures:
+    name: Notify scraping failures
+    needs: updateElasticsearchIndexes
+    if: ${{ always() && github.repository == 'github/docs-internal' && github.event_name != 'workflow_dispatch' && needs.updateElasticsearchIndexes.result != 'cancelled' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repo
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+
+      - name: Download all failure artifacts
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        with:
+          pattern: search-failures-*
+          path: /tmp/failures
+        continue-on-error: true
 
-            Workflow: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+      - name: Check if any failures were downloaded
+        id: check-artifacts
+        run: |
+          if [ -d /tmp/failures ] && [ "$(ls -A /tmp/failures 2>/dev/null)" ]; then
+            echo "has_artifacts=true" >> $GITHUB_OUTPUT
+          else
+            echo "has_artifacts=false" >> $GITHUB_OUTPUT
+          fi
 
-      - uses: ./.github/actions/slack-alert
-        if: ${{ failure() && github.event_name != 'workflow_dispatch' }}
+      - uses: ./.github/actions/node-npm-setup
+        if: ${{ steps.check-artifacts.outputs.has_artifacts == 'true' }}
+
+      - name: Aggregate failures and format message
+        if: ${{ steps.check-artifacts.outputs.has_artifacts == 'true' }}
+        id: aggregate
+        run: |
+          RESULT=$(npx tsx src/search/scripts/aggregate-search-index-failures.ts /tmp/failures \
+            --workflow-url "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}")
+          {
+            echo 'result<<EOF'
+            echo "$RESULT"
+            echo 'EOF'
+          } >> "$GITHUB_OUTPUT"
+
+      - name: Send consolidated Slack notification
+        if: ${{ steps.check-artifacts.outputs.has_artifacts == 'true' }}
+        uses: ./.github/actions/slack-alert
         with:
           slack_channel_id: ${{ secrets.DOCS_ALERTS_SLACK_CHANNEL_ID }}
           slack_token: ${{ secrets.SLACK_DOCS_BOT_TOKEN }}
+          message: ${{ fromJSON(steps.aggregate.outputs.result).message }}

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

@@ -42,18 +42,30 @@ jobs:
           fi
 
       - name: Upload report artifact
-        if: failure()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        if: always()
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: external-link-report
           path: artifacts/external-link-report.*
           retention-days: 14
+          if-no-files-found: ignore
+
+      - name: Check if report exists
+        if: always()
+        id: check_report
+        run: |
+          if [ -f "artifacts/external-link-report.md" ]; then
+            echo "has_report=true" >> $GITHUB_OUTPUT
+          else
+            echo "has_report=false" >> $GITHUB_OUTPUT
+            echo "No broken link report generated - all links valid!"
+          fi
 
       - name: Create issue if broken links found
-        if: failure()
+        if: always() && steps.check_report.outputs.has_report == 'true'
         uses: peter-evans/create-issue-from-file@fca9117c27cdc29c6c4db3b86c48e4115a786710 # v5
         with:
-          token: ${{ secrets.DOCS_BOT_PAT_WORKFLOW }}
+          token: ${{ secrets.DOCS_BOT_PAT_BASE }}
           repository: github/docs-content
           title: '🌐 Broken External Links Report'
           content-filepath: artifacts/external-link-report.md

.github/workflows/index-general-search.yml

@@ -78,7 +78,7 @@ jobs:
         if: matrix.language != 'en'
         uses: ./.github/actions/clone-translations
         with:
-          token: ${{ secrets.DOCS_BOT_PAT_READPUBLICKEY }}
+          token: ${{ secrets.DOCS_BOT_PAT_BASE }}
 
       - name: Check internal links
         env:
@@ -90,7 +90,7 @@ jobs:
 
       - name: Upload report artifact
         if: always()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: link-report-${{ matrix.version }}-${{ matrix.language }}
           path: artifacts/link-report-*.md
@@ -113,7 +113,7 @@ jobs:
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
 
       - name: Download all artifacts
-        uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           path: reports
           pattern: link-report-*
@@ -125,14 +125,14 @@ jobs:
           # Check if any reports exist
           if ls reports/*.md 1> /dev/null 2>&1; then
             echo "has_reports=true" >> $GITHUB_OUTPUT
-            
+
             # Combine all markdown reports
             echo "# Internal Links Report" > combined-report.md
             echo "" >> combined-report.md
             echo "Generated: $(date -u +'%Y-%m-%d %H:%M UTC')" >> combined-report.md
             echo "[Action run](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})" >> combined-report.md
             echo "" >> combined-report.md
-            
+
             for report in reports/*.md; do
               echo "---" >> combined-report.md
               cat "$report" >> combined-report.md
@@ -147,7 +147,7 @@ jobs:
         if: steps.combine.outputs.has_reports == 'true'
         uses: peter-evans/create-issue-from-file@fca9117c27cdc29c6c4db3b86c48e4115a786710 # v5
         with:
-          token: ${{ secrets.DOCS_BOT_PAT_WORKFLOW }}
+          token: ${{ secrets.DOCS_BOT_PAT_BASE }}
           repository: github/docs-content
           title: '🔗 Broken Internal Links Report'
           content-filepath: combined-report.md

.github/workflows/link-check-external.yml

@@ -37,7 +37,7 @@ jobs:
 
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@48d8f15b2aaa3d255ca5af3eba4870f807ce6b3c # v45
+        uses: tj-actions/changed-files@e0021407031f5be11a464abee9a0776171c79891 # v45
         with:
           files: |
             content/**/*.md

.github/workflows/link-check-internal.yml

@@ -8,7 +8,7 @@
 # ---------------------------------------------------------------
 # To update the sha:
 # https://github.com/github/gh-base-image/pkgs/container/gh-base-image%2Fgh-base-noble
-FROM ghcr.io/github/gh-base-image/gh-base-noble:20260126-172357-g0b997f8b3@sha256:738abde0d24406108b0eb4dc3ae2b934a4d2fb08750af8b80b36c16b4ca7ad18 AS base
+FROM ghcr.io/github/gh-base-image/gh-base-noble:20260128-000359-ga6d0dc7c0@sha256:e2dd6aa64dc4b3fd0fee388a817b2ce0ce239f1da31fd628c359a74832abdfcb AS base
 
 # Install curl for Node install and determining the early access branch
 # Install git for cloning docs-early-access & translations repos

.github/workflows/link-check-on-pr.yml

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright 2025 GitHub
+Copyright 2026 GitHub
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal