Merge branch 'main' into patch-1

Author: Sharra-writes

.github/workflows/local-dev.yml

@@ -60,7 +60,7 @@ jobs:
       - name: View the home page
         run: |
           echo "Going to sleep a little to wait for the server to start"
-          sleep 10
+          sleep 15
           curl --fail --retry-connrefused --retry 5 http://localhost:4000/
 
       - name: Run basic tests

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Docs changelog
 
+**23 September 2025**
+
+We've added new documentation for Spark that answers some common customer questions, helps customers troubleshoot known issues, and guides users on the best ways to prompt and provide context to Spark.
+
+See:
+- "[About GitHub Spark](https://docs.github.com/en/copilot/concepts/spark)"
+- "[Troubleshooting common issues with GitHub Spark](https://docs.github.com/en/copilot/how-tos/troubleshoot-copilot/troubleshoot-spark)"
+- "[Write effective prompts and provide useful context for Spark](https://docs.github.com/en/copilot/tutorials/spark/prompt-tips)"
+
+<hr>
+
 **17 September 2025**
 
 We added documentation for expanded features for reusing workflow configurations in GitHub Actions. 
@@ -66,7 +77,7 @@ See: [Configure custom instructions for GitHub Copilot](https://docs.github.com/
 
 In addition to repository-wide custom instructions, specified in the `.github/copilot-instructions.md` file, Copilot Code Review now supports:
 
-* Path-specific custom instructions, specified in `.github/instructions/NAME.instructions.md` files.
+* Path-specific custom instructions, specified in `.github/instructions/**/NAME.instructions.md` files.
 * Custom instructions specified in the organization settings for Copilot.
 
 We have updated several articles in the GitHub documentation accordingly. We have also made changes to clarify the difference between the various types of custom instructions for Copilot Code Review, Copilot Chat, and Copilot Coding Agent.

Dockerfile

@@ -8,7 +8,7 @@
 # ---------------------------------------------------------------
 # To update the sha:
 # https://github.com/github/gh-base-image/pkgs/container/gh-base-image%2Fgh-base-noble
-FROM ghcr.io/github/gh-base-image/gh-base-noble:20250917-225833-g09a8eb42d AS base
+FROM ghcr.io/github/gh-base-image/gh-base-noble:20250924-191915-gc04d4a50b AS base
 
 # Install curl for Node install and determining the early access branch
 # Install git for cloning docs-early-access & translations repos

assets/images/help/copilot/coding-agent/assign-to-copilot-dialog.png

@@ -57,7 +57,9 @@ If you want to test changes on an instance that contains the same data and confi
 
 ### 2. Set up a staging instance
 
-Set up a new instance to act as your staging environment. You can use the same guides for provisioning and installing your staging instance as you did for your production instance. For more information, see [AUTOTITLE](/admin/installation/setting-up-a-github-enterprise-server-instance).
+Set up a new instance to act as your staging environment. When following the setup process, be sure to select the **New Install** option. This will ensure your staging environment is initialized properly and is ready for restoring a backup if needed.
+
+You can use the same guides for provisioning and installing your staging instance as you did for your production instance. For more information, see [AUTOTITLE](/admin/installation/setting-up-a-github-enterprise-server-instance).
 
 If you plan to restore a backup of your production instance, continue to the next step. Alternatively, you can configure the instance manually and skip the following steps.
 
@@ -66,62 +68,43 @@ If you plan to restore a backup of your production instance, continue to the nex
 
 ### 3. Configure {% data variables.product.prodname_actions %}
 
-Optionally, if you use {% data variables.product.prodname_actions %} on your production instance, configure the feature on the staging instance before restoring your production backup. If you don't use {% data variables.product.prodname_actions %}, skip to [1. Configure {% data variables.product.prodname_registry %}](#4-configure-github-packages).
+Optionally, if you use {% data variables.product.prodname_actions %} on your production instance, configure the feature on the staging instance before restoring your production backup. If you don't use {% data variables.product.prodname_actions %}, skip to [Configure {% data variables.product.prodname_registry %}](#4-configure-github-packages).
+
+To configure {% data variables.product.prodname_actions %} on your staging instance, use the {% data variables.enterprise.management_console %}.
+
+The {% data variables.enterprise.management_console %} provides a secure, browser-based interface for low-level configuration of your {% data variables.product.prodname_ghe_server %} instance, including {% data variables.product.prodname_actions %}. All configuration changes are audited, and access is protected via dedicated credentials and network controls.
 
 > [!WARNING]
 > If you don't configure {% data variables.product.prodname_actions %} on the staging instance before restoring your production backup, your staging instance will use your production instance's external storage, which could result in loss of data. We strongly recommended that you use different external storage for your staging instance. For more information, see [AUTOTITLE](/admin/github-actions/advanced-configuration-and-troubleshooting/using-a-staging-environment).
 
-{% data reusables.enterprise_installation.ssh-into-staging-instance %}
-1. To configure the staging instance to use an external storage provider for {% data variables.product.prodname_actions %}, enter one of the following commands.
-   {% data reusables.actions.configure-storage-provider-platform-commands %}
-{% data reusables.actions.configure-storage-provider %}
-1. To prepare to enable {% data variables.product.prodname_actions %} on the staging instance, enter the following command.
-
-   ```shell copy
-   ghe-config app.actions.enabled true
-   ```
+1. Access the {% data variables.enterprise.management_console %}. See [AUTOTITLE](/admin/administering-your-instance/administering-your-instance-from-the-web-ui/accessing-the-management-console).
 
-1. To apply the configuration changes, enter the following command.
+1. In the sidebar, open the **Actions** tab.
+1. Enable {% data variables.product.prodname_actions %} by checking **Enable {% data variables.product.prodname_actions %}**.
+1. Select your external storage provider for artifact and log storage.
+1. Enter the required storage and authentication details for your chosen provider.
+1. Test your configuration by clicking **Test storage settings**, then click **Save settings**.
 
-   ```shell copy
-   ghe-config-apply
-   ```
+Once you've configured and enabled {% data variables.product.prodname_actions %}, proceed to the next step.
 
 ### 4. Configure {% data variables.product.prodname_registry %}
 
-Optionally, if you use {% data variables.product.prodname_registry %} on your production instance, configure the feature on the staging instance before restoring your production backup. If you don't use {% data variables.product.prodname_registry %}, skip to [1. Restore your production backup](#5-restore-your-production-backup).
+Optionally, if you use {% data variables.product.prodname_registry %} on your production instance, configure the feature on the staging instance before restoring your production backup. If you don't use {% data variables.product.prodname_registry %}, skip to [Restore your production backup](#5-restore-your-production-backup).
 
 > [!WARNING]
-> If you don't configure {% data variables.product.prodname_registry %} on the staging instance before restoring your production backup, your staging instance will use your production instance's external storage, which could result in loss of data. We strongly recommended that you use different external storage for your staging instance.
-
-1. Review the backup you will restore to the staging instance.
-   * If you took the backup with {% data variables.product.prodname_enterprise_backup_utilities %} 3.5 or later, the backup includes the configuration for {% data variables.product.prodname_registry %}. Continue to the next step.
-   * If you took the backup with {% data variables.product.prodname_enterprise_backup_utilities %} 3.4 or earlier, configure {% data variables.product.prodname_registry %} on the staging instance. For more information, see [AUTOTITLE](/admin/packages/getting-started-with-github-packages-for-your-enterprise).
-{% data reusables.enterprise_installation.ssh-into-staging-instance %}
-1. Configure the external storage connection by entering the following commands, replacing the placeholder values with actual values for your connection.
-   * Azure Blob Storage:
-
-     ```shell copy
-     ghe-config secrets.packages.blob-storage-type "azure"
-     ghe-config secrets.packages.azure-container-name "AZURE CONTAINER NAME"
-     ghe-config secrets.packages.azure-connection-string "CONNECTION STRING"
-     ```
-
-   * Amazon S3:
-
-     ```shell copy
-     ghe-config secrets.packages.blob-storage-type "s3"
-     ghe-config secrets.packages.service-url "S3 SERVICE URL"
-     ghe-config secrets.packages.s3-bucket "S3 BUCKET NAME"
-     ghe-config secrets.packages.aws-access-key "S3 ACCESS KEY ID"
-     ghe-config secrets.packages.aws-secret-key "S3 ACCESS SECRET"
-     ```
-
-1. To prepare to enable {% data variables.product.prodname_registry %} on the staging instance, enter the following command.
-
-   ```shell copy
-   ghe-config app.packages.enabled true
-   ```
+> If you don't configure {% data variables.product.prodname_registry %} on the staging instance before restoring your production backup, your staging instance will use your production instance's external storage, which could result in loss of data. We strongly recommended that you use different external storage for your staging instance. For more information, see [AUTOTITLE](/admin/github-actions/advanced-configuration-and-troubleshooting/using-a-staging-environment).
+
+To configure {% data variables.product.prodname_registry %} for your staging instance:
+
+1. Access the {% data variables.enterprise.management_console %}. See [Accessing the Management Console](/admin/administering-your-instance/administering-your-instance-from-the-web-ui/accessing-the-management-console).
+1. In the sidebar, open the **Packages** tab.
+1. Enable GitHub Packages by checking the **Enable GitHub Packages** box.
+1. Under **Packages Storage Settings**, select your external storage provider.
+1. Test your storage configuration by clicking **Test storage settings**.
+1. Click **Save settings** to apply your configuration.
+
+> [!NOTE]
+> You can use ecosystem toggles to enable, disable, or set individual package types to read-only for your instance as needed.
 
 ### 5. Restore your production backup
 

assets/images/help/copilot/copilot-cli-welcome.png

@@ -57,6 +57,8 @@ The time required to failover depends on how long it takes to manually promote t
 1. Update the DNS record to point to the IP address of the replica. Traffic is directed to the replica after the TTL period elapses. If you are using a load balancer, ensure it is configured to send traffic to the replica.
 1. Notify users that they can resume normal operations.
 1. If desired, set up replication from the new primary to existing appliances and the previous primary. For more information, see [AUTOTITLE](/admin/enterprise-management/configuring-high-availability/about-high-availability-configuration#utilities-for-replication-management).
+   > [!NOTE]
+   > If there were multiple replicas before failover, the replicas that were not promoted during failover will remain part of the high availability group associated with the previous primary. Before re-establishing replication from the new primary, you must remove these replicas from the high availability configuration of the old primary. For more information, see [AUTOTITLE](/admin/monitoring-and-managing-your-instance/configuring-high-availability/removing-a-high-availability-replica#removing-replication-permanently).
 1. Appliances you do not intend to setup replication to that were part of the high availability configuration prior the failover, need to be removed from the high availability configuration by UUID.
     * On the former appliances, get their UUID via `cat /data/user/common/uuid`.
 

content/admin/installing-your-enterprise-server/setting-up-a-github-enterprise-server-instance/setting-up-a-staging-instance.md

@@ -19,6 +19,7 @@ topics:
 > [!NOTE]
 > * Merge protection with rulesets is not related to status checks. For more information about status checks, see [AUTOTITLE](/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks).
 > * Merge protection with rulesets will not apply to merge queue groups or {% data variables.product.prodname_dependabot %} pull requests analyzed by default setup.
+> * All the lines of code identified by an alert must exist in the pull request diff. For more information, see [AUTOTITLE](/code-security/code-scanning/integrating-with-code-scanning/sarif-support-for-code-scanning#specifying-the-location-for-source-files).
 
 You can use rulesets to prevent pull requests from being merged when one of the following conditions is met: