Merge pull request #36989 from github/repo-sync

Repo sync

Author: docs-bot

.github/actions/get-changed-files/action.yml

@@ -2,7 +2,7 @@ name: Get changed files
 description: Get a list of changed files
 
 inputs:
-  file_filter:
+  files:
     description: 'Files or directories to check for changes, supports names, directories, trailing slashes, and single trailing wildcard'
     required: false
     default: '.'

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

@@ -31,7 +31,23 @@ if [ -z "$DIFF" ]; then
   echo "__ using branch name $INPUT_HEAD __"
   git fetch origin main --depth 1
   echo "__ running git diff __"
-  DIFF=$(git diff --name-only origin/main $INPUT_HEAD)
+
+  temp_file=$(mktemp)
+  git diff --name-only origin/main $INPUT_HEAD > "$temp_file" 2>/dev/null
+  GIT_EXIT_CODE=$?
+
+  DIFF=$(cat "$temp_file")
+  rm -f "$temp_file"
+
+  if [ $GIT_EXIT_CODE -ne 0 ]; then
+    echo "__ git diff failed with exit code $GIT_EXIT_CODE, fetching unshallow __"
+    git fetch --depth=100 origin $INPUT_HEAD
+    git diff --name-only origin/main $INPUT_HEAD > "$temp_file" 2>/dev/null
+    DIFF=$(cat "$temp_file")
+    rm -f "$temp_file"
+  else
+    echo "__ git diff succeeded __"
+  fi
 fi
 
 # So we can inspect the output
@@ -58,23 +74,25 @@ if [ "$FILTER" != "." ]; then
   echo "$DIFF"
 fi
 
-# Format the output
 echo "__ formatting output __"
-FORMATTED_DIFF=$(echo $DIFF | tr '\n' ' ' | tr -s ' ')
-echo "$FORMATTED_DIFF"
+FORMATTED_DIFF=$(echo "$DIFF" | tr '\n' ' ' | tr -s ' ' | sed 's/^ *//' | sed 's/ *$//')
+echo "Formatted diff: '$FORMATTED_DIFF'"
 
 # Set the output for GitHub Actions
-if [[ -n "$GITHUB_OUTPUT" ]]; then
-  ALL_FORMATTED=$(echo "$DIFF" | tr '\n' ' ' | tr -s ' ')
-  echo "all_changed_files=$ALL_FORMATTED" >> "$GITHUB_OUTPUT"
-  echo "filtered_changed_files=$FORMATTED_DIFF" >> "$GITHUB_OUTPUT"
-else
-  echo "all_changed_files=$DIFF"
-  echo "filtered_changed_files=$FORMATTED_DIFF"
-fi
-
-# If output file is specified, write the filtered changes to it
 if [[ -n "$INPUT_OUTPUT_FILE" ]]; then
-  echo "$FORMATTED_DIFF" > "$INPUT_OUTPUT_FILE"
-  echo "__ wrote changes to $INPUT_OUTPUT_FILE __"
+  ALL_FORMATTED=$(echo "$DIFF" | tr '\n' ' ' | tr -s ' ' | sed 's/^ *//' | sed 's/ *$//')
+
+  # Only set outputs if there are actually changed files
+  if [[ -z "$ALL_FORMATTED" ]]; then
+    echo "No changed files detected, setting empty outputs"
+    echo "all_changed_files=" >> "$INPUT_OUTPUT_FILE"
+    echo "filtered_changed_files=" >> "$INPUT_OUTPUT_FILE"
+  else
+    echo "Setting non-empty outputs"
+    echo "all_changed_files=$ALL_FORMATTED" >> "$INPUT_OUTPUT_FILE"
+    echo "filtered_changed_files=$FORMATTED_DIFF" >> "$INPUT_OUTPUT_FILE"
+  fi
+else
+  echo "all_changed_files='$DIFF'"
+  echo "filtered_changed_files='$FORMATTED_DIFF'"
 fi

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

@@ -24,8 +24,6 @@ jobs:
     steps:
       - name: Check out repo
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-        with:
-          fetch-depth: 10
 
       - name: Set up Node and dependencies
         uses: ./.github/actions/node-npm-setup

.github/workflows/first-responder-v2-prs-collect.yml

@@ -65,29 +65,6 @@ jobs:
         run: |
           gh pr edit $PR_URL --add-label docs-content-fr
 
-      # Check if the PR is connected to an issue that has the DIY docs label. If yes, then add the DIY docs label to the PR.
-      - name: Check if PR is connected to DIY docs issue
-        id: check-diy-docs
-        env:
-          GITHUB_TOKEN: ${{ secrets.DOCS_BOT_PAT_WRITEORG_PROJECT }}
-        run: |
-          ISSUE_NUMS=$(echo "${{ github.event.pull_request.body }}" | grep -oE '(https://github.com/github/docs-content/issues/[0-9]+|#[0-9]+)' | grep -oE '[0-9]+')
-          for ISSUE_NUM in $ISSUE_NUMS; do
-            LABELS=$(gh issue view $ISSUE_NUM --repo github/docs-content --json labels --jq '.labels[].name')
-            if echo "$LABELS" | grep -q 'DIY docs'; then
-              echo "DIY_DOCS_LABEL=true" >> $GITHUB_ENV
-              break
-            fi
-          done
-
-      - name: Add the DIY docs label if connected to a DIY docs issue
-        if: ${{ env.DIY_DOCS_LABEL == 'true' }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.DOCS_BOT_PAT_WRITEORG_PROJECT }}
-          PR_URL: ${{ github.event.pull_request.html_url }}
-        run: |
-          gh pr edit $PR_URL --add-label 'DIY docs'
-
       # Add to the FR project
       # and set type to "Maintenance" or "External contributor PR"
       # and set date to now

.github/workflows/ready-for-doc-review.yml

@@ -1,6 +1,6 @@
 name: Ready for docs-content review
 
-# **What it does**: Adds pull requests in the docs-internal repository to the docs-content review board when the "ready-for-doc-review" label is added or when a review by docs-content or docs-reviewers is requested. This workflow is also called as a reusable workflow from other repos including docs-content, docs-strategy, docs-early-access, and github.
+# **What it does**: Adds pull requests in the docs-internal repository to the docs-content review board when the "ready-for-doc-review" label is added or when a review by docs-content or docs-reviewers is requested. Adds the "DIY docs" label to the PR if it is connected to a DIY docs issue in the docs-content repo. This workflow is also called as a reusable workflow from other repos including docs-content, docs-strategy, docs-early-access, and github.
 # **Why we have it**: So that other GitHub teams can easily request reviews from the docs-content team, and so that writers can see when a PR is ready for review
 # **Who does it impact**: Writers who need to review docs-related PRs
 
@@ -43,6 +43,41 @@ jobs:
             echo "AUTHOR_LOGIN=${{ github.event.pull_request.user.login }}" >> $GITHUB_ENV
           fi
 
+      # Check if the PR is connected to an issue that has the DIY docs label. The grep command parses through the PR description to find issue numbers that are linked in the PR description. The GitHub CLI command then checks if the issue exists in the docs-content repo, then checks if the linked docs-content issues have the DIY docs label. If the linked issues have the DIY docs label, the DIY_DOCS_LABEL environment variable is set to true.
+      - name: Check if PR is connected to DIY docs issue
+        id: check-diy-docs
+        env:
+          GITHUB_TOKEN: ${{ secrets.DOCS_BOT_PAT_WRITEORG_PROJECT }}
+        run: |
+          ISSUE_NUMS=$(echo "${{ github.event.pull_request.body }}" | grep -oE '(https://github.com/github/docs-content/issues/[0-9]+|github/docs-content#[0-9]+|#[0-9]+)' | grep -oE '[0-9]+$')
+
+          if [ -n "$ISSUE_NUMS" ]; then
+            for ISSUE_NUM in $ISSUE_NUMS; do
+              # Check if the issue exists in the docs-content repository
+              if gh issue view $ISSUE_NUM --repo github/docs-content --json labels > /dev/null 2>&1; then
+                # Fetch labels for the issue
+                LABELS=$(gh issue view $ISSUE_NUM --repo github/docs-content --json labels --jq '.labels[].name' || echo "")
+                if echo "$LABELS" | grep -q 'DIY docs'; then
+                  echo "DIY_DOCS_LABEL=true" >> $GITHUB_ENV
+                  break
+                fi
+              else
+                echo "Issue $ISSUE_NUM does not exist in the docs-content repository."
+              fi
+            done
+          else
+            echo "No DIY docs issues found in the PR description."
+          fi
+
+      # If the PR description contains a link to a DIY docs issue, add the DIY docs label to the PR.
+      - name: Add the DIY docs label if connected to a DIY docs issue
+        if: ${{ env.DIY_DOCS_LABEL == 'true' }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.DOCS_BOT_PAT_WRITEORG_PROJECT }}
+          PR_URL: ${{ github.event.pull_request.html_url }}
+        run: |
+          gh pr edit $PR_URL --add-label 'DIY docs'
+
       - name: Run script
         run: |
           npm run ready-for-docs-review

.github/workflows/reviewers-legal.yml

@@ -33,31 +33,23 @@ jobs:
     steps:
       - name: Check out repo
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-        with:
-          # Picking this number is a "best guess". If we make it too large,
-          # the checkout will take potentially unnecessarily long.
-          # This reduces the chance that tj-actions/changed-files has to
-          # fetch deeper history. But if it needs to, it will.
-          fetch-depth: 10
 
       - name: Get changed files
-        id: changed-files
-        uses: tj-actions/changed-files@40853de9f8ce2d6cfdc73c1b96f14e22ba44aec4 # v45.0.0
+        id: changed_files
+        uses: ./.github/actions/get-changed-files
         with:
           files: 'content/**'
-          output_renamed_files_as_deleted_and_added: true
 
       - name: Set up Node and dependencies
-        if: steps.changed-files.outputs.any_changed == 'true'
+        if: steps.changed_files.outputs.filtered_changed_files
         uses: ./.github/actions/node-npm-setup
 
       - name: Check content type
-        if: steps.changed-files.outputs.any_changed == 'true'
+        if: steps.changed_files.outputs.filtered_changed_files
         id: checkContentType
         run: npm run check-content-type
         env:
-          # all_changed_files does not include deleted files
-          CHANGED_FILE_PATHS: ${{ steps.changed-files.outputs.all_changed_files }}
+          CHANGED_FILE_PATHS: ${{ steps.changed_files.outputs.filtered_changed_files }}
           CONTENT_TYPE: 'rai'
 
       - name: Check for reviewers-legal label, add if missing and request review

assets/images/help/copilot/track-spending.png

@@ -18,7 +18,7 @@ environments:
     cluster_selector:
       profile: general
       region: iad
-    extra_completed_message: Review at https://docs-internal-staging-boxwood.githubapp.com/
+    extra_completed_message: ':boxwood: Review at https://docs-internal-staging-boxwood.githubapp.com/'
 
   - name: staging-cedar
     require_pipeline: false
@@ -29,7 +29,7 @@ environments:
     cluster_selector:
       profile: general
       region: iad
-    extra_completed_message: Review at https://docs-internal-staging-cedar.githubapp.com/
+    extra_completed_message: ':cedar: Review at https://docs-internal-staging-cedar.githubapp.com/'
 
   - name: staging-cypress
     require_pipeline: false
@@ -40,7 +40,7 @@ environments:
     cluster_selector:
       profile: general
       region: iad
-    extra_completed_message: Review at https://docs-internal-staging-cypress.githubapp.com/
+    extra_completed_message: ':cypress: Review at https://docs-internal-staging-cypress.githubapp.com/'
 
   - name: staging-fir
     require_pipeline: false
@@ -51,7 +51,7 @@ environments:
     cluster_selector:
       profile: general
       region: iad
-    extra_completed_message: Review at https://docs-internal-staging-fir.githubapp.com/
+    extra_completed_message: ':fir: Review at https://docs-internal-staging-fir.githubapp.com/'
 
   - name: staging-hemlock
     require_pipeline: false
@@ -62,7 +62,7 @@ environments:
     cluster_selector:
       profile: general
       region: iad
-    extra_completed_message: Review at https://docs-internal-staging-hemlock.githubapp.com/
+    extra_completed_message: ':hemlock: Review at https://docs-internal-staging-hemlock.githubapp.com/'
 
   - name: staging-holly
     require_pipeline: false
@@ -73,7 +73,7 @@ environments:
     cluster_selector:
       profile: general
       region: iad
-    extra_completed_message: Review at https://docs-internal-staging-holly.githubapp.com/
+    extra_completed_message: ':holly_: Review at https://docs-internal-staging-holly.githubapp.com/'
 
   - name: staging-juniper
     require_pipeline: false
@@ -84,7 +84,7 @@ environments:
     cluster_selector:
       profile: general
       region: iad
-    extra_completed_message: Review at https://docs-internal-staging-juniper.githubapp.com/
+    extra_completed_message: ':juniper: Review at https://docs-internal-staging-juniper.githubapp.com/'
 
   - name: staging-laurel
     require_pipeline: false
@@ -95,7 +95,7 @@ environments:
     cluster_selector:
       profile: general
       region: iad
-    extra_completed_message: Review at https://docs-internal-staging-laurel.githubapp.com/
+    extra_completed_message: ':laurel: Review at https://docs-internal-staging-laurel.githubapp.com/'
 
   - name: staging-pine
     require_pipeline: false
@@ -106,7 +106,7 @@ environments:
     cluster_selector:
       profile: general
       region: iad
-    extra_completed_message: Review at https://docs-internal-staging-pine.githubapp.com/
+    extra_completed_message: ':pine: Review at https://docs-internal-staging-pine.githubapp.com/'
 
   - name: staging-redwood
     require_pipeline: false
@@ -117,7 +117,7 @@ environments:
     cluster_selector:
       profile: general
       region: iad
-    extra_completed_message: Review at https://docs-internal-staging-redwood.githubapp.com/
+    extra_completed_message: ':redwood: Review at https://docs-internal-staging-redwood.githubapp.com/'
 
   - name: staging-sequoia
     require_pipeline: false
@@ -128,7 +128,7 @@ environments:
     cluster_selector:
       profile: general
       region: iad
-    extra_completed_message: Review at https://docs-internal-staging-sequoia.githubapp.com/
+    extra_completed_message: ':sequoia: Review at https://docs-internal-staging-sequoia.githubapp.com/'
 
   - name: staging-spruce
     require_pipeline: false
@@ -139,7 +139,7 @@ environments:
     cluster_selector:
       profile: general
       region: iad
-    extra_completed_message: Review at https://docs-internal-staging-spruce.githubapp.com/
+    extra_completed_message: ':spruce: Review at https://docs-internal-staging-spruce.githubapp.com/'
 
 required_builds:
   - docs-internal-moda-config-bundle / docs-internal-moda-config-bundle

config/moda/deployment.yaml

@@ -18,10 +18,11 @@ Budgets and alerts allow you to track spending for your {% ifversion fpt %}organ
 
 The budget only applies to expenses incurred from the date of its creation onwards. Any expenses incurred prior to the creation of the budget will not be included in the calculations
 
-Budgets are not applicable to:
+{% ifversion ghec %}
+Budgets are not applicable to pre-paid volume licenses.
+{% endif %}
 
-* {% ifversion enterprise-licensing-language %}License{% else %}Seat{% endif %}-based products such as {% data variables.product.prodname_copilot %}{% ifversion fpt %} and {% data variables.product.prodname_team %}{% elsif ghec %}, {% data variables.product.prodname_GH_advanced_security %}, and {% data variables.product.prodname_enterprise %}.
-* Pre-paid volume licenses{% endif %}.
+For license-based products such as {% data variables.product.prodname_copilot %}{% ifversion fpt %} and {% data variables.product.prodname_team %}{% elsif ghec %}, {% data variables.product.prodname_GH_advanced_security %}, and {% data variables.product.prodname_enterprise %}{% endif %}, setting a budget does not prevent usage over the limit.
 
 > [!NOTE]
 > By default, paid usage will be limited to $0 for accounts that do not have a payment method on file. For accounts that do have a payment method on file, the default budget is unlimited.

content/billing/using-the-new-billing-platform/preventing-overspending.md

@@ -1,7 +1,7 @@
 ---
-title: Adopting GitHub Advanced Security at scale
+title: 'Adopting {% data variables.product.prodname_GHAS %} at scale'
 shortTitle: Adopt GHAS at scale
-intro: A phased approach to rolling out GitHub Advanced Security at your company using industry and GitHub best practices.
+intro: A phased approach to rolling out {% data variables.product.prodname_GHAS %} at your company using industry and GitHub best practices.
 versions:
   ghes: '*'
   ghec: '*'