Cachiman patch 1

.github/ISSUE_TEMPLATE/partner-contributed-documentation.yml

@@ -64,4 +64,4 @@ body:
     attributes:
       value: |
         Once all tasks are completed, please mention `@github/docs-content` for next steps.
-        /cc @github/partner-engineering for :eyes:.
+        /cc @github/technology-partnerships-and-engineering for :eyes:.

.github/actions-scripts/purge-old-deployment-environments.js

@@ -29,6 +29,8 @@ async function main() {
     repo,
   })
 
+  console.log(`Found ${environments.length.toLocaleString()} environments in total`)
+
   let countDeletions = 0
   for (const environment of environments) {
     const ageDays = (Date.now() - Date.parse(environment.created_at)) / 1000 / 60 / 60 / 24

.github/actions-scripts/purge-old-workflow-runs.js

@@ -32,7 +32,7 @@ async function main() {
   const MAX_DELETIONS = parseInt(JSON.parse(process.env.MAX_DELETIONS || '100'))
   const MIN_AGE_DAYS = parseInt(process.env.MIN_AGE_DAYS || '90', 10)
 
-  const [owner, repo] = process.env.GITHUB_REPOSITORY.split('/')
+  const [owner, repo] = (process.env.GITHUB_REPOSITORY || 'github/docs-internal').split('/')
   if (!owner || !repo) {
     throw new Error('GITHUB_REPOSITORY environment variable not set')
   }
@@ -46,15 +46,35 @@ async function main() {
   // In practice it appears to list those that are oldest first.
   // But to guarantee that it reaches the oldest, we paginate over
   // all of them.
-  const allWorkflows = await github.paginate('GET /repos/{owner}/{repo}/actions/workflows', {
-    owner,
-    repo,
-  })
+  let allWorkflows = []
+
+  try {
+    allWorkflows = await github.paginate('GET /repos/{owner}/{repo}/actions/workflows', {
+      owner,
+      repo,
+    })
+  } catch (error) {
+    console.log('Error happened when getting workflows')
+    console.warn('Status: %O', error.status)
+    console.warn('Message: %O', error.message)
+
+    // Generally, if it fails, it's because of a network error or
+    // because busy servers. It's not our fault, but considering that
+    // this script is supposed to run on frequent schedule, we don't
+    // need to fret. We'll just try again next time.
+    if (isOperationalError(error.status, error.message)) {
+      return
+    } else {
+      throw error
+    }
+  }
+
+  const validWorkflows = allWorkflows.filter((w) => !w.path.startsWith('dynamic/'))
 
   const sortByDate = (a, b) => a.updated_at.localeCompare(b.updated_at)
   const workflows = [
-    ...allWorkflows.filter((w) => !fs.existsSync(w.path)).sort(sortByDate),
-    ...allWorkflows.filter((w) => fs.existsSync(w.path)).sort(sortByDate),
+    ...validWorkflows.filter((w) => !fs.existsSync(w.path)).sort(sortByDate),
+    ...validWorkflows.filter((w) => fs.existsSync(w.path)).sort(sortByDate),
   ]
 
   let deletions = 0
@@ -65,11 +85,27 @@ async function main() {
         ? `${workflow.path} still exists on disk`
         : `${workflow.path} no longer exists on disk`,
     )
-    deletions += await deleteWorkflowRuns(github, owner, repo, workflow, {
-      dryRun: DRY_RUN,
-      minAgeDays: MIN_AGE_DAYS,
-      maxDeletions: MAX_DELETIONS - deletions,
-    })
+    try {
+      deletions += await deleteWorkflowRuns(github, owner, repo, workflow, {
+        dryRun: DRY_RUN,
+        minAgeDays: MIN_AGE_DAYS,
+        maxDeletions: MAX_DELETIONS - deletions,
+      })
+    } catch (error) {
+      console.log("Error happened when calling 'deleteWorkflowRuns'")
+      console.warn('Status: %O', error.status)
+      console.warn('Message: %O', error.message)
+
+      // Generally, if it fails, it's because of a network error or
+      // because busy servers. It's not our fault, but considering that
+      // this script is supposed to run on frequent schedule, we don't
+      // need to fret. We'll just try again next time.
+      if (isOperationalError(error.status, error.message)) {
+        break
+      } else {
+        throw error
+      }
+    }
 
     if (deletions >= MAX_DELETIONS) {
       console.log(`Reached max number of deletions: ${MAX_DELETIONS}`)
@@ -79,6 +115,20 @@ async function main() {
   console.log(`Deleted ${deletions} runs in total`)
 }
 
+function isOperationalError(status, message) {
+  if (status && status >= 500) {
+    return true
+  }
+  if (/Unable to delete logs while the workflow is running/.test(message)) {
+    return true
+  }
+  if (status === 403 && /API rate limit exceeded/.test(message)) {
+    return true
+  }
+
+  return false
+}
+
 async function deleteWorkflowRuns(
   github,
   owner,

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

@@ -201,7 +201,7 @@ jobs:
           rsync -rptovR ./user-code/components/./**/*.{scss,ts,tsx} ./components
           rsync -rptovR --ignore-missing-args ./user-code/lib/./**/*.{js,ts} ./lib
           rsync -rptovR --ignore-missing-args ./user-code/middleware/./**/*.{js,ts} ./middleware
-          rsync -rptovR ./user-code/pages/./**/*.tsx ./pages
+          rsync -rptovR ./user-code/src/./**/*.tsx ./src
           rsync -rptovR ./user-code/stylesheets/./**/*.scss ./stylesheets
 
       - uses: ./.github/actions/warmup-remotejson-cache

.github/workflows/no-response.yaml

@@ -21,12 +21,17 @@ permissions:
 jobs:
   noResponse:
     runs-on: ubuntu-latest
-    if: github.repository == 'github/docs-internal' || github.repository == 'github/docs'
+    if: github.repository == 'github/docs'
     steps:
-      - uses: lee-dohm/no-response@9bb0a4b5e6a45046f00353d5de7d90fb8bd773bb
+      - uses: actions/stale@184e7afe930f6b5c7ce52c4b3f087692c6e912f3
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          closeComment: >
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          only-labels: 'more-information-needed'
+          days-before-stale: -1
+          days-before-issue-stale: 14
+          days-before-close: -1
+          days-before-issue-close: 0
+          close-issue-message: >
             This issue has been automatically closed because there has been no response
             to our request for more information from the original author. With only the
             information that is currently in the issue, we don't have enough information

.github/workflows/purge-old-deployment-environments.yml

@@ -10,7 +10,7 @@ name: Purge old deployment environments
 on:
   workflow_dispatch:
   schedule:
-    - cron: '20 16 * * *' # Run every day at 16:20 UTC / 8:20 PST
+    - cron: '20 */3 * * *' # Run every 3 hours at 20 minutes past the hour
 
 permissions:
   contents: write

.github/workflows/purge-old-workflow-runs.yml

@@ -7,7 +7,7 @@ name: Purge old workflow runs
 on:
   workflow_dispatch:
   schedule:
-    - cron: '20 */3 * * *' # Run every day at 16:20 UTC / 8:20 PST
+    - cron: '20 */2 * * *' # Run every 2 hours at 20 minutes past the hour
 
 permissions:
   contents: write

.github/workflows/sync-audit-logs.yml

@@ -0,0 +1,114 @@
+name: Sync Audit Log data
+
+# **What it does**: This updates our Audit Logs schema.
+# **Why we have it**: We want our Audit Logs up to date.
+# **Who does it impact**: Docs engineering, people reading Audit Logs.
+
+on:
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  pull-requests: write
+
+# **IMPORTANT:** Do not change the FREEZE environment variable set here!
+# This workflow runs on a recurring basis. To temporarily disable it (e.g.,
+# during a docs deployment freeze), add an Actions Secret to the repo settings
+# called `FREEZE` with a value of `true`. To re-enable Audit Logs updates, simply
+# delete that Secret from the repo settings. The environment variable here
+# will duplicate that Secret's value for later evaluation.
+env:
+  FREEZE: ${{ secrets.FREEZE }}
+
+# This allows a subsequently queued workflow run to interrupt previous runs
+concurrency:
+  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  cancel-in-progress: true
+
+jobs:
+  update_audit_logs_files:
+    if: github.repository == 'github/docs-internal'
+    runs-on: ubuntu-latest
+    steps:
+      - if: ${{ env.FREEZE == 'true' }}
+        run: |
+          echo 'The repo is currently frozen! Exiting this workflow.'
+          exit 1 # prevents further steps from running
+
+      - name: Checkout
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+
+      - uses: ./.github/actions/node-npm-setup
+
+      - name: Run updater script
+        env:
+          # need to use a token from a user with access to github/audit-log-allowlists for this step
+          GITHUB_TOKEN: ${{ secrets.DOCS_BOT_PAT_WRITEORG_PROJECT }}
+        run: |
+          src/audit-logs/scripts/sync.js
+
+      - name: Check if changes exist
+        id: changes-exist
+        run: |
+          # If nothing to commit, exit now. It's fine. No orphans.
+          changes=$(git diff --name-only | wc -l)
+          untracked=$(git status --untracked-files --short | wc -l)
+          if [[ $changes -eq 0 ]] && [[ $untracked -eq 0 ]]; then
+            echo "There are no changes to commit after running src/audit-logs/scripts/sync.js. Exiting..."
+            echo "CHANGES_EXIST=false" >> "$GITHUB_OUTPUT"
+            exit 0
+          else
+            echo "CHANGES_EXIST=true" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Create pull request
+        if: ${{ steps.changes-exist.outputs.CHANGES_EXIST == 'true' }}
+        id: create-pull-request
+        uses: peter-evans/create-pull-request@5b4a9f6a9e2af26e5f02351490b90d01eb8ec1e5 # pin @v5.0.0
+        env:
+          # Disable pre-commit hooks; they don't play nicely here
+          HUSKY: '0'
+        with:
+          # Need to use a token with repo and workflow scopes for this step.
+          # Token should be a PAT because actions performed with GITHUB_TOKEN
+          # don't trigger other workflows and this action force pushes updates
+          # from the default branch.
+          token: ${{ secrets.DOCS_BOT_PAT_WORKFLOW }}
+          commit-message: 'Update Audit Logs data files'
+          title: Audit Logs schema update
+          body:
+            "Hello! Some Audit Logs data in github/audit-log-allowlists was updated recently. This PR
+            syncs up the Audit Logs data in this repo.\n\n
+            If CI passes, this PR will be auto-merged. :green_heart:\n\n
+            If CI does not pass or other problems arise, contact #docs-engineering on slack."
+          branch: audit-logs-schema-update
+
+      - name: Enable GitHub auto-merge
+        if: ${{ steps.create-pull-request.outputs.pull-request-number }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.DOCS_BOT_PAT_READPUBLICKEY }}
+          AUTOMERGE_PR_NUMBER: ${{ steps.create-pull-request.outputs.pull-request-number }}
+        run: node .github/actions-scripts/enable-automerge.js
+
+      - if: ${{ failure() && env.FREEZE != 'true'}}
+        name: Delete remote branch (if previous steps failed)
+        uses: dawidd6/action-delete-branch@47743101a121ad657031e6704086271ca81b1911
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          branches: audit-logs-schema-update
+
+      - if: ${{ steps.create-pull-request.outputs.pull-request-number }}
+        name: Approve
+        uses: juliangruber/approve-pull-request-action@dcc4effb325c0b503408619918d56e40653dcc91
+        with:
+          github-token: ${{ secrets.DOCUBOT_REPO_PAT }}
+          number: ${{ steps.create-pull-request.outputs.pull-request-number }}
+
+      # - name: Send Slack notification if workflow fails
+      #   uses: someimportantcompany/github-actions-slack-message@1d367080235edfa53df415bd8e0bbab480f29bad
+      #   if: ${{ failure() && env.FREEZE != 'true' }}
+      #   with:
+      #     channel: ${{ secrets.DOCS_ALERTS_SLACK_CHANNEL_ID }}
+      #     bot-token: ${{ secrets.SLACK_DOCS_BOT_TOKEN }}
+      #     color: failure
+      #     text: The last sync-audit-logs run for ${{github.repository}} failed. See https://github.com/${{github.repository}}/actions/workflows/sync-audit-logs.yml

.github/workflows/translation-health-report.yml

@@ -101,7 +101,7 @@ jobs:
       # https://learn.microsoft.com/en-us/cli/azure/storage/blob?view=azure-cli-latest#az-storage-blob-upload
       # https://github.com/marketplace/actions/azure-cli-action
       - name: Upload latest to Azure blob storage
-        uses: azure/CLI@d88d5767d50cde2679128b45d287ec5b98df892e
+        uses: azure/CLI@b0e31ae20280d899279f14c36e877b4c6916e2d3 # pin @v1.0.8
         with:
           inlineScript: |
             az storage blob upload \
@@ -113,7 +113,7 @@ jobs:
               --overwrite true
 
       - name: Upload date formatted to Azure blob storage
-        uses: azure/CLI@d88d5767d50cde2679128b45d287ec5b98df892e
+        uses: azure/CLI@b0e31ae20280d899279f14c36e877b4c6916e2d3 # pin @v1.0.8
         with:
           inlineScript: |
             # Write a date formatted for historical reference

Dockerfile

@@ -5,7 +5,7 @@
 # --------------------------------------------------------------------------------
 # To update the sha, run `docker pull node:$VERSION-alpine`
 # look for something like: `Digest: sha256:0123456789abcdef`
-FROM node:18-alpine@sha256:58878e9e1ed3911bdd675d576331ed8838fc851607aed3bb91e25dfaffab3267 as base
+FROM node:18-alpine@sha256:3482a20c97e401b56ac50ba8920cc7b5b2022bfc6aa7d4e4c231755770cf892f as base
 
 # This directory is owned by the node user
 ARG APP_HOME=/home/node/app

components/article/ArticleInlineLayout.module.scss

@@ -1,4 +1,5 @@
-@import "@primer/css/support/index.scss";
+@import "@primer/css/support/variables/layout.scss";
+@import "@primer/css/support/mixins/layout.scss";
 @import "stylesheets/breakpoint-xxl.scss";
 
 .containerBox {

components/page-header/Header.module.scss

@@ -1,4 +1,5 @@
-@import "@primer/css/support/index.scss";
+@import "@primer/css/support/variables/layout.scss";
+@import "@primer/css/support/mixins/layout.scss";
 
 .header {
   display: unset;

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/index.md

@@ -14,7 +14,7 @@ versions:
 topics:
   - Accounts
 children:
-  - /managing-personal-account-settings
+  - /managing-user-account-settings
   - /managing-your-personal-account
   - /managing-email-preferences
   - /managing-access-to-your-personal-repositories

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-access-to-your-personal-repositories/inviting-collaborators-to-a-personal-repository.md

@@ -56,7 +56,7 @@ You can send an invitation to collaborate in your repository directly to someone
 
 ## Further reading
 
-- "[AUTOTITLE](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/permission-levels-for-a-personal-account-repository#collaborator-access-for-a-repository-owned-by-a-personal-account)"
+- "[AUTOTITLE](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-user-account-settings/permission-levels-for-a-personal-account-repository#collaborator-access-for-a-repository-owned-by-a-personal-account)"
 - "[AUTOTITLE](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-access-to-your-personal-repositories/removing-a-collaborator-from-a-personal-repository)"
 - "[AUTOTITLE](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-access-to-your-personal-repositories/removing-yourself-from-a-collaborators-repository)"
 - "[AUTOTITLE](/organizations/organizing-members-into-teams)"

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/setting-your-commit-email-address.md

@@ -55,7 +55,7 @@ To ensure that commits are attributed to you and appear in your contributions gr
 
 {% endnote %}
 
-If you use your `noreply` email address for {% data variables.product.product_name %} to make commits and then [change your username](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/changing-your-github-username), those commits will not be associated with your account on {% data variables.location.product_location %}. This does not apply if you're using the ID-based `noreply` address from {% data variables.product.product_name %}. For more information, see "[AUTOTITLE](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/changing-your-github-username)."{% endif %}
+If you use your `noreply` email address for {% data variables.product.product_name %} to make commits and then [change your username](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-user-account-settings/changing-your-github-username), those commits will not be associated with your account on {% data variables.location.product_location %}. This does not apply if you're using the ID-based `noreply` address from {% data variables.product.product_name %}. For more information, see "[AUTOTITLE](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-user-account-settings/changing-your-github-username)."{% endif %}
 
 ## Setting your commit email address on {% data variables.product.prodname_dotcom %}
 

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/about-your-personal-dashboard.md → content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-user-account-settings/about-your-personal-dashboard.md

@@ -7,6 +7,7 @@ redirect_from:
   - /github/setting-up-and-managing-your-github-user-account/about-your-personal-dashboard
   - /github/setting-up-and-managing-your-github-user-account/managing-user-account-settings/about-your-personal-dashboard
   - /account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/about-your-personal-dashboard
+  - /account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/about-your-personal-dashboard
 intro: 'You can visit your personal dashboard to keep track of issues and pull requests you''re working on or following, navigate to your top repositories and team pages, stay updated on recent activities in organizations and repositories you''re subscribed to, and explore recommended repositories.'
 versions:
   fpt: '*'

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/changing-your-github-username.md → content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-user-account-settings/changing-your-github-username.md

@@ -10,6 +10,7 @@ redirect_from:
   - /github/setting-up-and-managing-your-github-user-account/changing-your-github-username
   - /github/setting-up-and-managing-your-github-user-account/managing-user-account-settings/changing-your-github-username
   - /account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/changing-your-github-username
+  - /account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/changing-your-github-username
 versions:
   fpt: '*'
   ghes: '*'