Merge branch 'main' into rhysd-patch-1

Author: Sharra-writes

.github/workflows/generate-code-scanning-query-lists.yml

@@ -89,7 +89,7 @@ jobs:
           done
 
       - name: Upload security query lists
-        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: security-query-lists
           path: data/reusables/code-scanning/codeql-query-tables/
@@ -151,7 +151,7 @@ jobs:
           done
 
       - name: Upload quality query lists
-        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: quality-query-lists
           path: data/reusables/code-quality/codeql-query-tables/
@@ -181,13 +181,13 @@ jobs:
           echo "Copied files from github/codeql repo. Commit SHA: $OPENAPI_COMMIT_SHA"
 
       - name: Download security query lists
-        uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           name: security-query-lists
           path: data/reusables/code-scanning/codeql-query-tables/
 
       - name: Download quality query lists
-        uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           name: quality-query-lists
           path: data/reusables/code-quality/codeql-query-tables/

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Docs changelog
 
+**18 December 2025**
+
+The documentation has been updated to reflect the general availability of direct organization billing for premium request usage in Copilot Code Review. Organization members without a Copilot plan can now use Copilot Code Review on GitHub.com, with premium request usage billed directly to their organization or enterprise. See [Copilot code review without a Copilot license](https://docs.github.com/en/copilot/concepts/agents/code-review#copilot-code-review-without-a-copilot-license).
+
+<hr>
+
 **16 December 2025**
 
 We've added [a tutorial](https://docs.github.com/copilot/tutorials/modernize-java-applications) on how Copilot can help modernize and migrate Java applications by assessing your codebase, identifying upgrade paths, and automating remediation and containerization tasks.

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:20251119-090131-gb27dc275c AS base
+FROM ghcr.io/github/gh-base-image/gh-base-noble:20251217-105955-g05726ec4c AS base
 
 # Install curl for Node install and determining the early access branch
 # Install git for cloning docs-early-access & translations repos

assets/example-scripts/billing/README.md

@@ -259,7 +259,9 @@ includeGuides:
   - `id` (required): Unique identifier for the journey. The id only needs to be unique for journeys within a single journey landing page.
   - `title` (required): Display title for the journey (supports Liquid variables)
   - `description` (optional): Description of the journey (supports Liquid variables)
-  - `guides` (required): Array of article paths that make up this journey
+  - `guides` (required): Array of guide objects that make up this journey. Each guide object has:
+    - `href` (required): Path to the article
+    - `alternativeNextStep` (optional): Custom text to guide users to alternative paths in the journey. Supports Liquid variables and `[AUTOTITLE]`.
 - Only applicable when used with `layout: journey-landing`.
 - Optional.
 
@@ -271,15 +273,16 @@ journeyTracks:
     title: 'Getting started with {% data variables.product.prodname_actions %}'
     description: 'Learn the basics of GitHub Actions.'
     guides:
-      - '/actions/quickstart'
-      - '/actions/learn-github-actions'
-      - '/actions/using-workflows'
+      - href: '/actions/quickstart'
+      - href: '/actions/learn-github-actions'
+        alternativeNextStep: 'Want to skip ahead? See [AUTOTITLE](/actions/using-workflows).'
+      - href: '/actions/using-workflows'
   - id: 'advanced'
     title: 'Advanced {% data variables.product.prodname_actions %}'
     description: 'Dive deeper into advanced features.'
     guides:
-      - '/actions/using-workflows/workflow-syntax-for-github-actions'
-      - '/actions/deployment/deploying-with-github-actions'
+      - href: '/actions/using-workflows/workflow-syntax-for-github-actions'
+      - href: '/actions/deployment/deploying-with-github-actions'
 ```
 
 ### `type`

content/README.md

@@ -18,19 +18,14 @@ topics:
   - CD
 ---
 
-{% data reusables.actions.self-hosted-price-note %}
-
 A self-hosted runner is a system that you deploy and manage to execute jobs from {% data variables.product.prodname_actions %} on {% data variables.product.github %}.
 
 Self-hosted runners:
 
 {% ifversion fpt or ghec %}
 * Give you more control of hardware, operating system, and software tools than {% data variables.product.github %}-hosted runners provide. Be aware that you are responsible for updating the operating system and all other software.
-* Allow you to use machines and services that your company already maintains and pays to use.{% endif %} {% ifversion actions-cloud-platform-march %}
-* Add little to your bill for actions usage because you pay only for using the actions cloud platform. See [AUTOTITLE](/billing/concepts/product-billing/github-actions).{% elsif fpt or ghec %}
-* Are currently free to use with {% data variables.product.prodname_actions %}. From {% data variables.actions.self_hosted_runner_charge_date %}, you will see a small per-minute charge for using the actions cloud platform in your bill for actions usage. See [AUTOTITLE](/billing/concepts/product-billing/github-actions).{% endif %} {% ifversion ghes %}
+* Allow you to use machines and services that your company already maintains and pays to use.{% endif %}
 * Are free to use with {% data variables.product.prodname_actions %}, but you are responsible for the cost of maintaining your runner machines.
-* Can use cloud services or local machines that you already pay for.{% endif %}
 * Let you create custom hardware configurations that meet your needs with processing power or memory to run larger jobs, install software available on your local network.
 * Receive automatic updates for the self-hosted runner application only, though you may disable automatic updates of the runner.
 * Don't need to have a clean instance for every job execution.{% ifversion ghec or ghes %}

content/actions/concepts/runners/self-hosted-runners.md

@@ -29,8 +29,6 @@ Before you add a self-hosted runner, you should understand what they are and how
 Additionally, you must meet the following requirements:
 {% data reusables.actions.self-hosted-runners-prerequisites %}
 
-{% data reusables.actions.self-hosted-price-note %}
-
 ## Adding a self-hosted runner to a repository
 
 You can add self-hosted runners to a single repository. To add a self-hosted runner to a user repository, you must be the repository owner. For an organization repository, {% ifversion custom-org-roles %}you must be an organization owner, have admin access to the repository, or have the “Manage organization runners and runner groups” permission.{% else %}you must be an organization owner or have admin access to the repository.{% endif %}

content/actions/how-tos/manage-runners/self-hosted-runners/add-runners.md

@@ -15,8 +15,6 @@ versions:
   ghec: '*'
 ---
 
-{% data reusables.actions.self-hosted-price-note %}
-
 {% data reusables.actions.enterprise-github-hosted-runners %}
 
 {% ifversion repository-actions-runners %}

content/actions/how-tos/manage-runners/self-hosted-runners/use-in-a-workflow.md

@@ -22,11 +22,7 @@ contentType: how-tos
 
 If your runner needs to communicate via a proxy server, you can configure proxy settings using environment variables or system-level configurations.
 
-| Variable      | Description                                                                                           | Example                                                                                     |
-| ------------- | ----------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- |
-| `https_proxy` | Proxy URL for HTTPS traffic. You can include basic authentication if required.                        | `http://proxy.local`<br>`http://192.168.1.1:8080`<br>`http://username:[email protected]` |
-| `http_proxy`  | Proxy URL for HTTP traffic. You can include basic authentication if required.                         | `http://proxy.local`<br>`http://192.168.1.1:8080`<br>`http://username:[email protected]` |
-| `no_proxy`    | A comma-separated list of hosts or IP addresses that should bypass the proxy. Some clients only honor IP addresses when connections are made directly to the IP rather than a hostname. | `example.com`<br>`example.com,myserver.local:443,example.org`                               |
+{% data reusables.actions.actions-proxy-environment-variables-table %}
 
 The proxy environment variables are read when the runner application starts, so you must set the environment variables before configuring or starting the runner application. If your proxy configuration changes, you must restart the runner application.
 

content/actions/how-tos/manage-runners/use-proxy-servers.md

@@ -28,7 +28,47 @@ This procedure demonstrates how to create a workflow template and metadata file.
 1. If it doesn't already exist, create a new repository named `.github` in your organization.
 1. Create a directory named `workflow-templates`.
 1. Create your new workflow file inside the `workflow-templates` directory.
-1. Create a metadata file inside the `workflow-templates` directory.
+
+   If you need to refer to a repository's default branch, you can use the `$default-branch` placeholder. When a workflow is created the placeholder will be automatically replaced with the name of the repository's default branch.
+
+   {% ifversion ghes %}
+
+   > [!NOTE]
+   > The following values in the `runs-on` key are also treated as placeholders:
+   >
+   > * `ubuntu-latest` is replaced with `[ self-hosted ]`
+   > * `windows-latest` is replaced with `[ self-hosted, windows ]`
+   > * `macos-latest` is replaced with `[ self-hosted, macOS ]`
+   {% endif %}
+
+   For example, this file named `octo-organization-ci.yml` demonstrates a basic workflow.
+
+   ```yaml copy
+   name: Octo Organization CI
+
+   on:
+     push:
+       branches: [ $default-branch ]
+     pull_request:
+       branches: [ $default-branch ]
+
+   jobs:
+     build:
+       runs-on: ubuntu-latest
+
+       steps:
+         - uses: {% data reusables.actions.action-checkout %}
+
+         - name: Run a one-line script
+           run: echo Hello from Octo Organization
+   ```
+
+1. Create a metadata file inside the `workflow-templates` directory. The metadata file must have the same name as the workflow file, but instead of the `.yml` extension, it must be appended with `.properties.json`. For example, this file named `octo-organization-ci.properties.json` contains the metadata for a workflow file named `octo-organization-ci.yml`:
+
+   {% data reusables.actions.workflow-templates-metadata-example %}
+
+   {% data reusables.actions.workflow-templates-metadata-keys %}
+
 1. To add another workflow template, add your files to the same `workflow-templates` directory.
 
 ## Next steps