Merge pull request #40346 from github/repo-sync

Repo sync

Author: docs-bot

.github/actions/get-changed-files/get-changed-files.sh

@@ -18,8 +18,9 @@ git fetch --depth=1 origin main
 git fetch --depth=1 origin ${INPUT_HEAD:-HEAD}
 
 # Get diff with status information
+# Find the merge-base (common ancestor) instead of using origin/main directly
 echo "__ running git diff with status __"
-DIFF_OUTPUT=$(git diff --name-status origin/main origin/${INPUT_HEAD:-HEAD})
+DIFF_OUTPUT=$(git diff --name-status origin/main...origin/${INPUT_HEAD:-HEAD})
 
 # Function to extract files by pattern from diff output
 extract_files() {

.github/workflows/article-api-docs.yml

@@ -18,7 +18,7 @@ permissions:
 
 jobs:
   check-content-linter-rules-docs:
-    runs-on: ${{ fromJSON('["ubuntu-latest", "ubuntu-20.04-xl"]')[github.repository == 'github/docs-internal'] }}
+    runs-on: ubuntu-latest
     if: github.repository == 'github/docs-internal' || github.repository == 'github/docs'
     steps:
       - name: Checkout

.github/workflows/content-lint-markdown.yml

@@ -20,7 +20,7 @@ permissions:
 jobs:
   lint-content:
     if: github.repository == 'github/docs-internal' || github.repository == 'github/docs'
-    runs-on: ${{ fromJSON('["ubuntu-latest", "ubuntu-20.04-xl"]')[github.repository == 'github/docs-internal'] }}
+    runs-on: ubuntu-latest
     steps:
       - name: Check out repo
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

.github/workflows/content-linter-rules-docs.yml

@@ -21,7 +21,7 @@ permissions:
 
 jobs:
   check-content-linter-rules-docs:
-    runs-on: ${{ fromJSON('["ubuntu-latest", "ubuntu-20.04-xl"]')[github.repository == 'github/docs-internal'] }}
+    runs-on: ubuntu-latest
     if: github.repository == 'github/docs-internal' || github.repository == 'github/docs'
     steps:
       - name: Checkout

.github/workflows/count-translation-corruptions.yml

@@ -21,7 +21,7 @@ permissions:
 jobs:
   count-translation-corruptions:
     if: github.repository == 'github/docs-internal'
-    runs-on: ubuntu-20.04-xl
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout English repo
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

.github/workflows/generate-code-scanning-query-lists.yml

@@ -29,7 +29,7 @@ permissions:
 jobs:
   generate-query-lists:
     if: github.repository == 'github/docs-internal'
-    runs-on: ubuntu-20.04-xl
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout repository code
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

.github/workflows/headless-tests.yml

@@ -25,7 +25,7 @@ env:
 jobs:
   playwright-tests:
     if: github.repository == 'github/docs-internal' || github.repository == 'github/docs'
-    runs-on: ${{ fromJSON('["ubuntu-latest", "ubuntu-20.04-xl"]')[github.repository == 'github/docs-internal'] }}
+    runs-on: ubuntu-latest
     strategy:
       # When we're comfortable a11y tests aren't generating false positives and helping,
       # let's remove the matrix and just run playwright in a single job.

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

@@ -20,7 +20,7 @@ permissions:
 jobs:
   index-autocomplete-elasticsearch:
     if: ${{ github.repository == 'github/docs-internal' }}
-    runs-on: ubuntu-20.04-xl
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

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

@@ -33,7 +33,7 @@ env:
 
 jobs:
   dryRunElasticsearchIndexes:
-    runs-on: ubuntu-20.04-xl
+    runs-on: ubuntu-latest
     if: github.repository == 'github/docs-internal'
     steps:
       - name: Check out repo

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

@@ -98,7 +98,7 @@ jobs:
     needs: figureOutMatrix
     name: Update indexes
     if: ${{ github.repository == 'github/docs-internal' && needs.figureOutMatrix.outputs.matrix != '[]' }}
-    runs-on: ubuntu-20.04-xl
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       # When it's only English (i.e. a simple array of ['en']), this value