Merge remote-tracking branch 'upstream/main' into dependabot/npm_and_yarn/npm_and_yarn-2bd33993d4

# Conflicts:
#	package-lock.json

Author: kaziwahidaltaher-droid

.devcontainer/Dockerfile

@@ -1,5 +1,5 @@
 # To find available Node images, see https://mcr.microsoft.com/en-us/product/devcontainers/javascript-node/tags
 
 # [Choice] Node.js version
-ARG VARIANT="dev-22-bullseye"
+ARG VARIANT="dev-24-bullseye"
 FROM mcr.microsoft.com/devcontainers/javascript-node:${VARIANT}

.devcontainer/devcontainer.json

@@ -6,7 +6,7 @@
   "build": {
     "dockerfile": "Dockerfile",
     // Update 'VARIANT' to pick a Node version
-    "args": { "VARIANT": "22" }
+    "args": { "VARIANT": "24" }
   },
 
   // Install features. Type 'feature' in the VS Code command palette for a full list.
@@ -59,11 +59,13 @@
   },
 
   // Lifecycle commands
-  "onCreateCommand": "npm ci",
+  // Install dependencies then install Copilot CLI
+  "onCreateCommand": "npm ci && npm install -g @github/copilot@prerelease",
+  // Start a web server and keep it running
   "postStartCommand": "nohup bash -c 'npm start &'",
-  // Set the port to be public
+  // Set port 4000 to be public
   "postAttachCommand": "gh cs ports visibility 4000:public -c \"$CODESPACE_NAME\"",
-
+  
   // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
   "remoteUser": "node",
 

.dockerignore

@@ -4,8 +4,7 @@
 .vscode/
 contributing/
 docs/
-node_modules/
-tests/
-# Folder is cloned during the Dockerfile build
 docs-early-access/
+node_modules/
 README.md
+tests/

.github/CODEOWNERS

@@ -4,10 +4,10 @@
 # https://git-scm.com/docs/gitignore
 
 # Site Policy
-/content/site-policy/ @github/site-policy-admins
+content/site-policy/ @github/site-policy-admins
 
 # Enterprise
-/data/release-notes/**/*.yml @github/docs-content-enterprise
+data/release-notes/**/*.yml @github/docs-content-enterprise
 src/ghes-releases/lib/enterprise-dates.json @github/docs-content-enterprise
 
 # Requires review of #actions-oidc-integration, docs-engineering/issues/1506

.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: '12'
+  delay:
+    description: 'Delay between attempts in seconds'
+    required: false
+    default: '30'
+
+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