Merge branch 'main' into patch-2

Author: rachaelrenk

.github/actions-scripts/update-merge-queue-branch.js

@@ -200,16 +200,6 @@ 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
-        # This 'if' will be truth, if this workflow is...
-        #  - run as a workflow_dispatch
-        #  - run because of a push to main (or when added to a merge queue)
-        #  - run as a regular pull request
-        # But if it's a pull request, *and* for whatever reason, the pull
-        # request has "Auto-merge" enabled, don't bother.
-        # The idea is that if auto-merge has been abled, by humans or by
-        # bots, they have no intention of viewing the deployed preview anyway.
-        # This saves time because the PR can merge sooner.
-        if: ${{ !github.event.pull_request.auto_merge }}
         uses: azure/arm-deploy@841b12551939c88af8f6df767c24c38a5620fd0d
         with:
           resourceGroupName: ${{ secrets.PREVIEW_ENV_RESOURCE_GROUP }}
@@ -223,8 +213,6 @@ jobs:
             dockerRegistryPassword="${{ secrets.NONPROD_REGISTRY_PASSWORD }}"
 
       - name: Check that it can reached
-        # To match the "Run ARM deploy" step above
-        if: ${{ !github.event.pull_request.auto_merge }}
         # This introduces a necessary delay. Because the preview evironment
         # URL is announced to the pull request as soon as all the steps
         # finish, what sometimes happens is that a viewer of the PR clicks

.github/workflows/autoupdate-branch.yml

@@ -38,22 +38,46 @@ jobs:
       - name: Install
         run: npm ci
 
-      # Creates file "${{ env.HOME }}/files.json", among others
       - name: Gather files changed
-        uses: trilom/file-changes-action@a6ca26c14274c33b15e6499323aac178af06ad4b
-        with:
-          fileOutput: 'json'
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          PR: ${{ github.event.pull_request.number }}
+          HEAD: ${{ github.event.pull_request.head.ref || github.event.merge_group.head_ref }}
+        run: |
+          # Find the file diff in the pull request or merge group
+          # If its a pull request, use the faster call to the GitHub API
+          # For push, workflow_dispatch, and merge_group, use git diff
+          if [ -n "$PR" ]
+          then
+            echo __ running gh pr diff __
+            DIFF=`gh pr diff $PR --name-only`
+          elif [ -n "$HEAD" ]
+          then
+            echo __ running git fetch main __
+            git fetch origin main --depth 1
+            echo __ running git diff __
+            DIFF=`git diff --name-only origin/main`
+          else
+            echo __ no head, empty diff __
+            DIFF=''
+          fi
+          # So we can inspect the output
+          echo __ DIFF found __
+          echo $DIFF
 
-      # For verification
-      - name: Show files changed
-        run: cat $HOME/files.json
+          # Formats into single line JSON array, removing any empty strings
+          echo __ format, write to files.json __
+          echo $DIFF | \
+            tr ' ' '\n' | \
+            jq --raw-input | \
+            jq --slurp --compact-output 'map(select(length > 0))' \
+            > $HOME/files.json
 
       - name: Link check (warnings, changed files)
         env:
           # Don't care about CDN caching image URLs
           DISABLE_REWRITE_ASSET_URLS: true
         run: |
-
           # Note as of Aug 2022, we *don't* check external links
           # on the pages you touched in the PR. We could enable that
           # but it has the added risk of false positives blocking CI.

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

@@ -1,8 +1,8 @@
 name: Site Policy Reminder
 
-# **What it does**: Automated comment reminder on a PR to change the title for public consumption before merging
-# **Why we have it**: Titles of merged PRs to Site Policies are sent to the public site-policy repo
-# **Who does it impact**: Docs team merging changes to Site Policies
+# **What it does**: Automated comment reminder on a PR to change the title for public consumption before merging and to run the Site Policy repo sync action
+# **Why we have it**: Titles of merged PRs to Site Policies are sent to the public site-policy repo when the repos are synced
+# **Who does it impact**: Everyone merging changes to Site Policies
 
 on:
   pull_request:
@@ -26,3 +26,5 @@ jobs:
           issue-number: ${{ github.event.pull_request.number }}
           body: |
             Before merging, please remember to change the title of this PR to a description of its changes that is suitable for public viewing on github/site-policy.
+
+            <@github/site-policy-admins>, when these changes are ready to be synced to the site policy repo for the 24-hour or 30-day [review window](https://github.com/github/site-policy#whats-the-process), run the [site policy sync action](https://github.com/github/docs-internal/actions/workflows/site-policy-sync.yml) from this PR's branch. When these changes are ready to be merged in `docs-internal`, let the Docs team know on Slack in #docs-content and a writer will merge this PR.

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

@@ -53,7 +53,7 @@ jobs:
           echo "DESCRIPTION=$DESCRIPTION" >> $GITHUB_ENV
           git commit -m "$(echo $DESCRIPTION)"
 
-      - name: If there are changes to push, create a pull request in the public repo using the gh command line tool, then immediately merge the PR and delete the branch
+      - name: If there are changes to push, create a pull request in the public repo using the gh command line tool, then immediately approve the PR
         id: createAndMergePullRequest
         env:
           GITHUB_TOKEN: ${{ secrets.API_TOKEN_SITEPOLICY }}
@@ -70,11 +70,7 @@ jobs:
               git push --set-upstream origin automated-sync-$GITHUB_RUN_ID
               PR_URL=$(gh pr create --title "${TITLE}" --body-file msg --head automated-sync-$GITHUB_RUN_ID --base main --repo github/site-policy)
               gh pr diff ${PR_URL}
-              gh pr merge ${PR_URL} --merge --delete-branch
+              gh pr review --approve || echo "Nothing to approve"
             else
               echo "No updates to push to the public repo"
           fi
-
-      - name: Delete remote updates branch if previous step failed
-        if: failure() && steps.createAndMergePullRequest.outcome == 'failure'
-        run: git push github/site-policy --delete automated-sync-$GITHUB_RUN_ID

.github/workflows/site-policy-reminder.yml

@@ -13,6 +13,11 @@ on:
 permissions:
   contents: read
 
+# This allows a subsequently queued workflow run to cancel previous runs
+concurrency:
+  group: '${{ github.workflow }} @ ${{ github.head_ref }}'
+  cancel-in-progress: true
+
 env:
   FREEZE: ${{ secrets.FREEZE }}
   ELASTICSEARCH_URL: ${{ secrets.ELASTICSEARCH_URL }}