Merge branch 'main' into fix-typos-in-creating-redis-service-containers-docs

Author: jc-clark

.github/actions/labeler/labeler.ts

@@ -4,9 +4,9 @@ import coreLib from '@actions/core'
 import { type Octokit } from '@octokit/rest'
 import { CoreInject } from '@/links/scripts/action-injections'
 
-import github from '#src/workflows/github.ts'
-import { getActionContext } from '#src/workflows/action-context.ts'
-import { boolEnvVar } from '#src/workflows/get-env-inputs.ts'
+import github from '@/workflows/github'
+import { getActionContext } from '@/workflows/action-context'
+import { boolEnvVar } from '@/workflows/get-env-inputs'
 
 type Options = {
   addLabels?: string[]

.github/actions/retry-command/action.yml

@@ -0,0 +1,49 @@
+name: 'Retry command'
+description: 'Retries any command with configurable attempts and delay'
+inputs:
+  command:
+    description: 'The command to retry'
+    required: true
+  max_attempts:
+    description: 'Maximum number of retry attempts'
+    required: false
+    default: '8'
+  delay:
+    description: 'Delay between attempts in seconds'
+    required: false
+    default: '15'
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Retry command
+      shell: bash
+      run: |
+        # Generic retry function: configurable attempts and delay
+        retry_command() {
+          local max_attempts=${{ inputs.max_attempts }}
+          local delay=${{ inputs.delay }}
+          local attempt=1
+          local command="${{ inputs.command }}"
+
+          while [ $attempt -le $max_attempts ]; do
+            echo "Attempt $attempt/$max_attempts: Running command..."
+            echo "Command: $command"
+            if eval "$command"; then
+              echo "Command succeeded on attempt $attempt"
+              return 0
+            else
+              echo "Attempt $attempt failed"
+              if [ $attempt -lt $max_attempts ]; then
+                echo "Waiting $delay seconds before retry..."
+                sleep $delay
+              fi
+            fi
+            attempt=$((attempt + 1))
+          done
+
+          echo "Command failed after $max_attempts attempts"
+          return 1
+        }
+
+        retry_command

.github/copilot-instructions.md

@@ -0,0 +1,120 @@
+This documentation repository consists mainly of content written in Markdown format. These files are converted into HTML for displaying on a website. Most Markdown files become a single article on the documentation site. Other files contain reusable content which is inserted into multiple articles. The repository also contains YAML files (e.g. for variable text), image files, JavaScript/TypeScript files, etc.
+
+## Content guidelines
+
+### Bullet lists
+
+The bulleted points in a bullet list should always be denoted in Markdown using an asterisk, not a hyphen.
+
+### Using variables
+
+Within Markdown files, with the exception of the `title` field in the metadata at the start of a file, **always use the Liquid syntax variables rather than text** if a variable has been defined for that text. This ensures consistency and makes it easier to update product names globally.
+
+**Important**: Variables must be used in all content, including reusable content, data files, and regular articles. The only exception is the `title` field in frontmatter metadata.
+
+For example:
+
+| Use this variable                                        | Don't use this text      | File where variable is defined   |
+| -------------------------------------------------------- | ------------------------ | -------------------------------- |
+| `{% data variables.product.github %}`                    | GitHub                   | data/variables/product.yml       |
+| `{% data variables.product.prodname_ghe_server %}`       | GitHub Enterprise Server | data/variables/product.yml       |
+| `{% data variables.product.prodname_copilot_short %}`    | Copilot                  | data/variables/product.yml       |
+| `{% data variables.product.prodname_copilot %}`          | GitHub Copilot           | data/variables/product.yml       |
+| `{% data variables.copilot.copilot_code-review_short %}` | Copilot code review      | data/variables/copilot.yml       |
+| `{% data variables.enterprise.prodname_managed_user %}`  | managed user account     | data/variables/enterprise.yml    |
+| `{% data variables.code-scanning.codeql_workflow %}`     | CodeQL analysis workflow | data/variables/code-scanning.yml |
+
+There are many more variables. These are stored in various YAML files within the `data/variables` directory.
+
+**How to find variables**: Check the `data/variables` directory for existing variables before writing hardcoded text. Common variable files include:
+
+* `data/variables/product.yml` - Product names and variations
+* `data/variables/copilot.yml` - Copilot-specific terms
+* `data/variables/enterprise.yml` - Enterprise-specific terms
+* `data/variables/code-scanning.yml` - Code scanning terms
+
+### Reusable text
+
+Reusables are long strings of reusable text, such as paragraphs or procedural lists, that are referenced in multiple content files. This makes it easier for us to maintain content and ensure that it is accurate across all files where the content is needed.
+
+Each reusable lives in its own Markdown file. The path and filename of each reusable determines what its path will be in the data object. For example, a file named `/data/reusables/foo/bar.md` will be accessible as `{% data reusables.foo.bar %}` in articles.
+
+Examples where you should create a reusable:
+
+* You are documenting a new feature for a public preview. You need to create a note to display in all new articles about the new feature. Create a new reusable for the note and use it in all articles where it is needed.
+* You are documenting billing for a new feature and need to briefly mention how the feature is billed and link to content about billing in several articles. Create a new reusable with the brief mention and a link to the content on billing. Aim to use the reusable in all places where you want to mention billing for the feature.
+
+### Links to other articles
+
+`[AUTOTITLE]` is the **only correct way** to specify the title of a linked article when that article is another page on the docs.github.com site.
+
+You can replace the placeholder link text `[AUTOTITLE]` only when linking to an anchor in the same article or when linking to an anchor in another article and the actual article title would be confusing.
+
+Never use the `{% link %}` Liquid tag for internal documentation links. The `[AUTOTITLE]` placeholder automatically pulls the correct title and ensures links remain valid when titles change.
+
+Examples:
+
+* ✅ Correct: `For more information, see [AUTOTITLE](/copilot/using-github-copilot).`
+* ❌ Incorrect: `For more information, see [Using GitHub Copilot](/copilot/using-github-copilot).`
+* ❌ Incorrect: `For more information, see {% link /copilot/using-github-copilot %}.`
+
+### Parenthetical dashes
+
+Where a sentence of normal body text contains a parenthetical dash, the dash should always be an em dash without spaces at either side. This rule does not apply to text within code blocks.
+
+Examples:
+
+* ✅ Correct: "The cat—which sat on a branch—smiled with a broad grin." (em dash without spaces)
+* ❌ Incorrect: "The cat — which sat on a branch — smiled with a broad grin." (em dash with spaces)
+* ❌ Incorrect: "The cat–which sat on a branch–smiled with a broad grin." (en dash without spaces)
+* ❌ Incorrect: "The cat – which sat on a branch – smiled with a broad grin." (en dash with spaces)
+* ❌ Incorrect: "The cat-which sat on a branch-smiled with a broad grin." (hyphen without spaces)
+* ❌ Incorrect: "The cat - which sat on a branch - smiled with a broad grin." (hyphen with spaces)
+
+## Creating a pull request
+
+When creating a pull request as a result of a request to do so in Copilot Chat, the first line of the PR description should **always** be the following (in italics):
+
+`_This pull request was created as a result of the following prompt in Copilot Chat._`
+
+Then, within a collapsed section, quote the original prompt from Copilot Chat:
+
+```markdown
+<details>
+<summary>Original prompt - submitted by @GITHUB-USER-ID</summary>
+
+> [Original prompt text here]
+
+</details>
+```
+
+This helps reviewers understand the context and intent behind the automated changes.
+
+## Development and testing guidelines
+
+### Content changes
+
+Before committing content changes, always:
+
+1. **Use the content linter** to validate content: `npm run lint-content -- --paths <file-paths>`
+2. **Check for proper variable usage** in your content
+3. **Verify [AUTOTITLE] links** point to existing articles
+4. **Run tests** on changed content: `npm run test -- src/content-render/tests/render-changed-and-deleted-files.js`
+
+### Script and code changes
+
+For TypeScript, JavaScript, and SCSS files:
+
+1. **Run Prettier** to check formatting: `npm run prettier-check`
+2. **Run the linter**: `npm run lint`
+3. **Run TypeScript checks**: `npm run tsc`
+4. **Run relevant tests**: `npm test`
+
+### Environment setup
+
+When testing changes in your development environment:
+
+1. Install dependencies: `npm ci`
+2. For content changes, ensure the content linter runs successfully
+3. For script changes, ensure all formatting and linting checks pass
+4. Always verify your changes don't break existing functionality

.github/workflows/all-documents.yml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repo
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - uses: ./.github/actions/node-npm-setup
 

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

@@ -22,7 +22,7 @@ jobs:
     if: github.repository == 'github/docs-internal' || github.repository == 'github/docs'
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - uses: ./.github/actions/node-npm-setup
 

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

@@ -20,11 +20,11 @@ jobs:
       # need to use a token from a user with access to github/github for this step
       GITHUB_TOKEN: ${{ secrets.DOCS_BOT_PAT_BASE }}
       REPORT_AUTHOR: docs-bot
-      REPORT_LABEL: github github broken link report
+      REPORT_LABEL: github github broken link report,workflow-generated
       REPORT_REPOSITORY: github/docs-content
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           # To prevent issues with cloning early access content later
           persist-credentials: 'false'

.github/workflows/close-on-invalid-label.yaml

@@ -37,7 +37,7 @@ jobs:
 
       - name: Check out repo
         if: ${{ failure() && github.event_name != 'pull_request_target' }}
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - uses: ./.github/actions/slack-alert
         if: ${{ failure() && github.event_name != 'pull_request_target' }}

.github/workflows/codeql.yml

@@ -35,7 +35,7 @@ jobs:
     if: github.repository == 'github/docs-internal' || github.repository == 'github/docs'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: github/codeql-action/init@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0
         with:
           languages: javascript # comma separated list of values from {go, python, javascript, java, cpp, csharp, ruby}

.github/workflows/confirm-internal-staff-work-in-docs.yml

@@ -83,7 +83,7 @@ jobs:
 
       - name: Check out repo
         if: ${{ failure() && github.event_name != 'pull_request_target' }}
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: ./.github/actions/slack-alert
         if: ${{ failure() && github.event_name != 'pull_request_target' }}
         with:

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

@@ -23,7 +23,7 @@ jobs:
     runs-on: ${{ fromJSON('["ubuntu-latest", "ubuntu-20.04-xl"]')[github.repository == 'github/docs-internal'] }}
     steps:
       - name: Check out repo
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Set up Node and dependencies
         uses: ./.github/actions/node-npm-setup