Skip to content

Commit 441132a

Browse files
Merge branch 'main' into patch-1
2 parents 6f82524 + 33b574c commit 441132a

File tree

207 files changed

+30986
-21441
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

207 files changed

+30986
-21441
lines changed

.github/workflows/auto-add-ready-for-doc-review.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
- name: Add ready-for-doc-review label
4949
if: steps.membership_check.outputs.result == 'false'
5050
env:
51-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
51+
GITHUB_TOKEN: ${{ secrets.DOCS_BOT_PAT_BASE }}
5252
PR_URL: ${{ github.event.pull_request.html_url }}
5353
run: |
5454
gh pr edit $PR_URL --add-label ready-for-doc-review

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# ---------------------------------------------------------------
99
# To update the sha:
1010
# https://github.com/github/gh-base-image/pkgs/container/gh-base-image%2Fgh-base-noble
11-
FROM ghcr.io/github/gh-base-image/gh-base-noble:20251016-101023-g0e97a15f4 AS base
11+
FROM ghcr.io/github/gh-base-image/gh-base-noble:20251114-221740-gd084d271e AS base
1212

1313
# Install curl for Node install and determining the early access branch
1414
# Install git for cloning docs-early-access & translations repos
233 KB
Loading
162 KB
Loading

content/actions/concepts/workflows-and-actions/reusing-workflow-configurations.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,9 @@ Let's compare some aspects of each solution:
5656
| Called directly within a job, not from a step | Run as a step within a job |
5757
| Can contain multiple jobs | Does not contain jobs |
5858
| Each step is logged in real-time | Logged as one step even if it contains multiple steps |
59-
| Can connect a maximum of ten levels of workflows | Can be nested to have up to 10 composite actions in one workflow |
59+
| Can connect a maximum of {% ifversion fpt or ghec %}ten {% else %}four {% endif %}levels of workflows | Can be nested to have up to 10 composite actions in one workflow |
6060
| Can use secrets | Cannot use secrets |
61+
| Cannot be published to the [marketplace](https://github.com/marketplace?type=actions) | Can be published to the [marketplace](https://github.com/marketplace?type=actions) |
6162

6263
## Workflow templates
6364

content/actions/how-tos/reuse-automations/reuse-workflows.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,9 @@ jobs:
181181

182182
## Nesting reusable workflows
183183

184-
You can connect a maximum of ten levels of workflows - that is, the top-level caller workflow and up to nine levels of reusable workflows. For example: _caller-workflow.yml_ → _called-workflow-1.yml_ → _called-workflow-2.yml_ → _called-workflow-3.yml_ → ... → _called-workflow-9.yml_. Loops in the workflow tree are not permitted.
184+
You can connect a maximum of {% ifversion fpt or ghec %}ten levels of workflows - that is, the top-level caller workflow and up to nine levels of reusable workflows. For example: _caller-workflow.yml_ → _called-workflow-1.yml_ → _called-workflow-2.yml_ → _called-workflow-3.yml_ → ... → _called-workflow-9.yml_.{% else %}four levels of workflows - that is, the top-level caller workflow and up to three levels of reusable workflows. For example: _caller-workflow.yml_ → _called-workflow-1.yml_ → _called-workflow-2.yml_ → _called-workflow-3.yml_.{% endif %}
185+
186+
Loops in the workflow tree are not permitted.
185187

186188
> [!NOTE] Nested reusable workflows require all workflows in the chain to be accessible to the caller, and permissions can only be maintained or reduced—not elevated—throughout the chain. For more information, see [AUTOTITLE](/actions/reference/reusable-workflows-reference#access-and-permissions-for-nested-workflows).
187189

content/actions/reference/workflows-and-actions/events-that-trigger-workflows.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ on:
234234
gollum
235235
```
236236

237-
## image_version_ready
237+
## `image_version`
238238

239239
| Webhook event payload | Activity types | `GITHUB_SHA` | `GITHUB_REF` |
240240
|----------------------| -------------- | ------------ | -------------|

content/actions/reference/workflows-and-actions/reusing-workflow-configurations.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,9 @@ For {% ifversion ghes or ghec %}internal or {% endif %}private repositories, the
4646

4747
### Limitations of reusable workflows
4848

49-
* You can connect up to ten levels of workflows. For more information, see [Nesting reusable workflows](/actions/how-tos/sharing-automations/reuse-workflows#nesting-reusable-workflows).
50-
* You can call a maximum of 50 unique reusable workflows from a single workflow file. This limit includes any trees of nested reusable workflows that may be called starting from your top-level caller workflow file.
49+
50+
* You can connect up to {% ifversion fpt or ghec %}ten {% else %}four {% endif %}levels of workflows. For more information, see [Nesting reusable workflows](/actions/how-tos/sharing-automations/reuse-workflows#nesting-reusable-workflows).
51+
* You can call a maximum of {% ifversion fpt or ghec %}50 {% else %}20 {% endif %}unique reusable workflows from a single workflow file. This limit includes any trees of nested reusable workflows that may be called starting from your top-level caller workflow file.
5152

5253
For example, _top-level-caller-workflow.yml__called-workflow-1.yml__called-workflow-2.yml_ counts as 2 reusable workflows.
5354

content/admin/backing-up-and-restoring-your-instance/backup-service-for-github-enterprise-server/configuring-the-backup-service.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,9 @@ If you're using a dedicated block device as your backup target, you need to init
8080
This command:
8181
* Formats the device (erases all data).
8282
* Prepares it for use by the backup service.
83-
* Sets it to mount automatically at `/data/backup` on boot.
84-
83+
* Sets it to mount automatically at `/data/backup` on boot.{% ifversion ghes > 3.19 %}
84+
* If in a clustered environment, configures the node in `cluster.conf` with the `backup-server` role.{% endif %}
85+
8586
{% ifversion ghes = 3.17 %}
8687
From {% data variables.product.prodname_ghe_server %} 3.17.4 onward, the script is installed in PATH so you can run it directly using: `ghe-storage-init-backup /dev/YOUR_DEVICE_NAME`.
8788
{% endif %}
@@ -109,9 +110,9 @@ If the device was already initialized using `ghe-storage-init-backup`, you can r
109110
110111
### Configuring backup settings
111112
112-
After the backup target is mounted, the Backup Service page will become available in the {% data variables.enterprise.management_console %}. If you're using a block device, this requires completing the initialization or mount steps above.
113+
After the backup target is mounted, the Backup Service page will become available in the {% data variables.enterprise.management_console %}. {% ifversion ghes > 3.19 %} If your instance is part of a clustered environment, the system will automatically detect the node that was initialized with `ghe-storage-init-backup` and treat it as the backup server. {% endif %}
113114
114-
>[!NOTE] The settings page won’t appear until the backup storage is mounted at `/data/backup`.
115+
>[!NOTE] The settings page won’t appear until the backup storage is mounted at `/data/backup` by completing the initialization or mount steps above.
115116
116117
If you're migrating from {% data variables.product.prodname_enterprise_backup_utilities %}, you can transfer your configuration in one of two ways:
117118

content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-code-governance.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ The following are eligible for bypass access:
6363
* Enterprise teams, enterprise apps, and enterprise roles ({% data variables.release-phases.public_preview %})
6464
* Repository admins, organization owners, and enterprise owners
6565
* The maintain or write role, or deploy keys.
66+
{%- ifversion ghec %}
67+
* {% data variables.copilot.copilot_coding_agent %}. For more information about {% data variables.copilot.copilot_coding_agent %}, see [AUTOTITLE](/copilot/concepts/agents/coding-agent/about-coding-agent#limitations-in-copilot-coding-agents-compatibility-with-other-features).
68+
{%- endif %}
6669

6770
1. To grant bypass permissions for the ruleset, in the "Bypass list" section, click **Add bypass**.
6871

@@ -120,6 +123,9 @@ You can grant certain roles, teams, or apps bypass permissions as well as the ab
120123
* Enterprise teams, enterprise apps, and enterprise roles ({% data variables.release-phases.public_preview %})
121124
* Repository admins, organization owners, and enterprise owners
122125
* The maintain or write role, or deploy keys
126+
{%- ifversion ghec %}
127+
* {% data variables.copilot.copilot_coding_agent %}. For more information about {% data variables.copilot.copilot_coding_agent %}, see [AUTOTITLE](/copilot/concepts/agents/coding-agent/about-coding-agent#limitations-in-copilot-coding-agents-compatibility-with-other-features).
128+
{%- endif %}
123129

124130
1. To grant bypass permissions for the ruleset, in the "Bypass list" section, click **Add bypass**.
125131
1. In the "Add bypass" modal dialog that appears, search for the role, team, or app you would like to grant bypass permissions, then select the role, team, or app from the "Suggestions" section and click Add Selected.

0 commit comments

Comments
 (0)