Skip to content

Commit d85cf24

Browse files
authored
Merge pull request #44547 from github/repo-sync
Repo sync
2 parents 86bc2ea + 7790dfb commit d85cf24

10 files changed

Lines changed: 223 additions & 7 deletions

File tree

content/admin/upgrading-your-instance/troubleshooting-upgrades/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@ versions:
66
children:
77
- /restoring-from-a-failed-upgrade
88
- /known-issues-with-upgrades-to-your-instance
9+
- /rotating-the-signing-key-for-upgrade-packages
910
shortTitle: Troubleshoot an upgrade
1011
---

content/admin/upgrading-your-instance/troubleshooting-upgrades/known-issues-with-upgrades-to-your-instance.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ category:
1717

1818
{% data variables.product.company_short %} is aware of the following issues that could impact upgrades to new releases of {% data variables.product.prodname_ghe_server %}. For more information, see "Known issues" in the [{% data variables.product.prodname_ghe_server %} release notes](/admin/release-notes).
1919

20+
If you see the error `The file provided is not a valid GitHub Enterprise Server package` when attempting an upgrade, you may need to rotate the GPG signing key on your instance. For more information, see [AUTOTITLE](/admin/upgrading-your-instance/troubleshooting-upgrades/rotating-the-signing-key-for-upgrade-packages).
21+
2022
{% data variables.product.company_short %} strongly recommends regular backups of your instance's configuration and data. Before you proceed with any upgrade, back up your instance, then validate the backup in a staging environment. For more information, see [AUTOTITLE](/admin/configuration/configuring-your-enterprise/configuring-backups-on-your-appliance) and [AUTOTITLE](/admin/installation/setting-up-a-github-enterprise-server-instance/setting-up-a-staging-instance).
2123

2224
## Lifting the pause on upgrades to version 3.15 and above
Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
---
2+
title: Rotating the signing key for upgrade packages
3+
intro: 'Learn how to rotate the GPG public key on {% data variables.product.prodname_ghe_server %} when {% data variables.product.company_short %} updates the key used to sign upgrade packages.'
4+
versions:
5+
ghes: '*'
6+
shortTitle: Rotate upgrade signing key
7+
contentType: how-tos
8+
category:
9+
- Back up and upgrade your instance
10+
---
11+
12+
## About upgrade package signing keys
13+
14+
{% data variables.product.prodname_ghe_server %} upgrade packages are signed with a GPG key so that administrators can verify the packages come from {% data variables.product.company_short %}. When you install an upgrade, the appliance checks the package signature against the GPG public key stored in its keyring.
15+
16+
Occasionally, {% data variables.product.company_short %} may rotate this signing key. When that happens, you must update the GPG public key on your instance before you can install any upgrade packages signed with the new key. Your instance will continue to function normally without the key rotation, but upgrades will fail signature verification until the key is updated.
17+
18+
If the signing key has not been rotated, attempting to install an upgrade package will fail with the following error:
19+
20+
```text
21+
Error: The file provided is not a valid GitHub Enterprise Server package.
22+
```
23+
24+
## Considerations for unsupported versions
25+
26+
{% data variables.product.company_short %} strongly recommends upgrading to a supported version as soon as possible.
27+
28+
Versions of {% data variables.product.prodname_ghe_server %} prior to 3.16 are not being re-signed with the new GPG key. If you are on version 3.13 or earlier you will not be able to rotate the GPG public key until you are on at least version 3.14. If you rotate your GPG public key before upgrading to at least 3.14 you will not be able to install upgrades, as the prior GPG public key will be removed from your {% data variables.product.prodname_ghe_server %} instance.
29+
30+
For help determining the correct upgrade path, use the [{% data variables.enterprise.upgrade_assistant %}](https://support.github.com/enterprise/server-upgrade).
31+
32+
## Prerequisites
33+
34+
* SSH access to your {% data variables.product.prodname_ghe_server %} instance. For more information, see [AUTOTITLE](/admin/administering-your-instance/accessing-the-administrative-shell-ssh).
35+
* Your instance must be able to reach `enterprise.github.com` over HTTPS to download the rotation script. If your instance is behind a restrictive firewall or in an air-gapped environment, download the script from an external machine and transfer it to the appliance manually.
36+
37+
## Rotating the signing key on a single-node instance
38+
39+
1. Connect to your {% data variables.product.prodname_ghe_server %} instance via SSH.
40+
1. Download the rotation script provided by {% data variables.product.company_short %}.
41+
42+
```shell
43+
curl -fsSL https://enterprise.github.com/security/2026-05-24/rotate-gpg.sh -o rotate-gpg.sh
44+
```
45+
46+
1. Run the rotation script. The script must be run twice: once as the `admin` user and once with `sudo`, because the key is stored in both the admin and root accounts.
47+
48+
```shell
49+
chmod ug+x ./rotate-gpg.sh
50+
./rotate-gpg.sh
51+
sudo ./rotate-gpg.sh
52+
```
53+
54+
1. Verify the rotation completed successfully. Each run of the script prints a confirmation message that includes the new key fingerprint.
55+
56+
## Rotating the signing key on HA or cluster topologies
57+
58+
For instances configured with high availability or clustering, the key must be rotated on every node.
59+
60+
1. Connect to any node in your HA or cluster installation via SSH.
61+
1. Download the rotation script provided by {% data variables.product.company_short %}.
62+
63+
```shell
64+
curl -fsSL https://enterprise.github.com/security/2026-05-24/rotate-gpg.sh -o rotate-gpg.sh
65+
```
66+
67+
1. Run the following commands. The `ghe-cluster-each` command copies the script to all nodes and runs it on all nodes.
68+
69+
```shell
70+
ghe-cluster-each -- chmod ug+x ./rotate-gpg.sh
71+
ghe-cluster-each -- ./rotate-gpg.sh
72+
ghe-cluster-each -- sudo ./rotate-gpg.sh
73+
```
74+
75+
1. Verify the rotation completed successfully on each node.
76+
77+
## Verifying the current signing key
78+
79+
To check which GPG signing key is currently installed on your instance, connect via SSH and run:
80+
81+
```shell
82+
gpg --list-keys --keyid-format long
83+
```
84+
85+
The output displays the fingerprint of the key in the keyring. Compare the fingerprint with the expected value published by {% data variables.product.company_short %} to confirm the rotation was applied correctly.
86+
87+
## What to expect after rotating the key
88+
89+
After you rotate the signing key:
90+
91+
* Your instance continues to function normally. No user downtime is required.
92+
* Previously downloaded upgrade packages that were signed with the prior key will fail verification. Download the latest available patch release to get a package signed with the new key.
93+
* Only download {% data variables.product.prodname_ghe_server %} updates from the official releases page. For more information, see [{% data variables.product.prodname_ghe_server %} releases](https://enterprise.github.com/releases).
94+
95+
## Reverting a key rotation
96+
97+
The rotation script removes the previous key from the GPG keyring before importing the new key. There is no built-in way to undo the rotation.
98+
99+
If you need assistance reverting a key rotation or recovering from a failed upgrade, [contact {% data variables.contact.github_support %}](/support/contacting-github-support).

content/copilot/concepts/billing/usage-based-billing-for-individuals.md

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ redirect_from:
1818
- /copilot/how-tos/manage-and-track-spending/prepare-for-your-move-to-usage-based-billing
1919
---
2020

21-
{% data variables.product.prodname_copilot_short %} usage is measured in {% data variables.product.prodname_ai_credits_short %}. All {% data variables.product.prodname_copilot_short %} plans include a monthly allowance of {% data variables.product.prodname_ai_credits_short %}. If you use up all of the credits included in your plan, you can purchase more and keep working.
21+
{% data variables.product.prodname_copilot_short %} usage is measured in {% data variables.product.prodname_ai_credits_short %}. All {% data variables.product.prodname_copilot_short %} plans include a monthly allowance of {% data variables.product.prodname_ai_credits_short %}. If you use up all of the credits included in your plan, you can purchase more and keep working.
2222

2323
## What are {% data variables.product.prodname_ai_credits %}?
2424

@@ -105,6 +105,30 @@ Your billing date will depend on whether or not you are already being billed by
105105
* **If you are not already being billed by {% data variables.product.prodname_dotcom %}**, in most cases your billing cycle will start on the day you sign up for {% data variables.product.prodname_copilot_short %}. For example, if you sign up on 3 September, with monthly billing, your initial billing cycle will run from 3 September until and including 2 October, and then on the same days of subsequent months.
106106
* **If you already have a billing cycle**, billing for {% data variables.product.prodname_copilot_short %} will be included in your next bill. You will be charged on a pro rata basis for that initial period.
107107

108+
<!-- expires 2026-09-01 -->
109+
110+
## Update your IDE, client, and extension
111+
112+
For the best experience with usage-based billing, update your IDE, client, and {% data variables.product.prodname_copilot_short %} extension to at least the versions listed below.
113+
114+
> [!NOTE]
115+
> Older versions will continue to work, but may display incorrect model pricing, inaccurate usage information, or outdated billing terminology. Usage alert notifications may also not appear as expected.
116+
117+
| IDE, client, or extension | Minimum version |
118+
| --- | --- |
119+
| {% data variables.product.prodname_vscode_shortname %} | 1.120 |
120+
| {% data variables.product.prodname_vs %} 2022 (17.x) | 17.14.33 |
121+
| {% data variables.product.prodname_vs %} 2025 (18.x) | 18.6.0 |
122+
| SQL Server Management Studio | 22.6 |
123+
| JetBrains IDEs (plugin) | 1.9.1 |
124+
| Eclipse (plugin) | 0.18.0 |
125+
| Xcode (extension) | 0.50.0 |
126+
| {% data variables.copilot.copilot_cli_short %} | 1.0.48 |
127+
128+
We recommend keeping your IDE, client, and {% data variables.product.prodname_copilot_short %} extensions on the latest available stable version. For information on configuring automatic updates, see [AUTOTITLE](/copilot/how-tos/configure-personal-settings/configure-in-ide). To update {% data variables.copilot.copilot_cli_short %}, see [AUTOTITLE](/copilot/how-tos/copilot-cli/set-up-copilot-cli/install-copilot-cli).
129+
130+
<!-- end expires 2026-09-01 -->
131+
108132
## Further reading
109133

110134
* [AUTOTITLE](/copilot/about-github-copilot/subscription-plans-for-github-copilot)

content/copilot/concepts/billing/usage-based-billing-for-organizations-and-enterprises.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,30 @@ Budget controls let you govern how individual users draw from the shared pool an
7777

7878
For a full explanation of how these controls work together and when usage gets blocked, see [AUTOTITLE](/copilot/concepts/billing/budgets-for-usage-based-billing).
7979

80+
<!-- expires 2026-09-01 -->
81+
82+
## Update your IDE, client, and extension
83+
84+
For the best experience with usage-based billing, update your IDE, client, and {% data variables.product.prodname_copilot_short %} extension to at least the versions listed below.
85+
86+
> [!NOTE]
87+
> Older versions will continue to work, but may display incorrect model pricing, inaccurate usage information, or outdated billing terminology. Usage alert notifications may also not appear as expected.
88+
89+
| IDE, client, or extension | Minimum version |
90+
| --- | --- |
91+
| {% data variables.product.prodname_vscode_shortname %} | 1.120 |
92+
| {% data variables.product.prodname_vs %} 2022 (17.x) | 17.14.33 |
93+
| {% data variables.product.prodname_vs %} 2025 (18.x) | 18.6.0 |
94+
| SQL Server Management Studio | 22.6 |
95+
| JetBrains IDEs (plugin) | 1.9.1 |
96+
| Eclipse (plugin) | 0.18.0 |
97+
| Xcode (extension) | 0.50.0 |
98+
| {% data variables.copilot.copilot_cli_short %} | 1.0.48 |
99+
100+
We recommend keeping your IDE, client, and {% data variables.product.prodname_copilot_short %} extensions on the latest available stable version. For information on configuring automatic updates, see [AUTOTITLE](/copilot/how-tos/configure-personal-settings/configure-in-ide). To update {% data variables.copilot.copilot_cli_short %}, see [AUTOTITLE](/copilot/how-tos/copilot-cli/set-up-copilot-cli/install-copilot-cli).
101+
102+
<!-- end expires 2026-09-01 -->
103+
80104
## Next steps
81105

82106
* To set up budget controls for your enterprise, see [AUTOTITLE](/copilot/tutorials/budgets/getting-started-with-budget-controls).

content/copilot/reference/copilot-cli-reference/cli-command-reference.md

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,8 @@ For a complete list of commands and options, run `copilot help`.
301301
> [!NOTE]
302302
> The `--remote`, `--no-remote`, and `--connect` options require the remote sessions feature to be available on your account.
303303
304+
You can use `--remote` with `--resume <TASK-ID>` to resume a remote task locally. This works even when the task was originally created outside a Git repository.
305+
304306
## Tool availability values
305307

306308
The `--available-tools` and `--excluded-tools` options support these values:
@@ -541,13 +543,26 @@ The CLI includes built-in MCP servers that are available without additional setu
541543

542544
| Server | Description |
543545
|--------|-------------|
544-
| `github-mcp-server` | {% data variables.product.github %} API integration: issues, pull requests, commits, code search, and {% data variables.product.prodname_actions %}. |
546+
| `github-mcp-server` | {% data variables.product.github %} API integration: issues, pull requests, labels, commits, code search, and {% data variables.product.prodname_actions %}. |
545547
| `playwright` | Browser automation: navigate, click, type, screenshot, and form handling. |
546548
| `fetch` | HTTP requests via the `fetch` tool. |
547549
| `time` | Time utilities: `get_current_time` and `convert_time`. |
548550

549551
Use `--disable-builtin-mcps` to disable all built-in servers, or `--disable-mcp-server SERVER-NAME` to disable a specific one.
550552

553+
#### {% data variables.product.github %} MCP server tools
554+
555+
The `github-mcp-server` provides the following tools.
556+
557+
| Tools | Description |
558+
|-------|-------------|
559+
| `get_file_contents`, `search_code` | Browse repository files. |
560+
| `list_issues`, `issue_read`, `search_issues` | Issue tracking. |
561+
| `get_pull_request`, `list_pull_requests`, `get_pull_request_files` | Pull requests. |
562+
| `list_commits`, `get_commit` | Commit history. |
563+
| `list_workflow_runs`, `get_workflow_run_logs` | {% data variables.product.prodname_actions %}. |
564+
| `get_label`, `list_label`, `label_write` | Label management. |
565+
551566
### MCP server naming
552567

553568
Server names can contain any printable characters, including spaces, Unicode characters, and punctuation. Control characters (U+0000–U+001F, U+007F) and the closing brace (`}`) are not allowed. Server names are used as prefixes for tool names—for example, a server named `my-server` produces tool names like `my-server-fetch`, and a server named `My Server` produces `My Server-fetch`.

data/reusables/dependabot/dependabot-updates-supported-versioning-tags.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,17 @@ The `dependabot.yml` file doesn't control the versioning tags that you can use,
1313
| sbt | `sbt` | `alpha, a, beta, b, milestone, m, rc, cr, sp, ga, final, release, snapshot` | `akka-actor@2.7.0-RC1`, `play-json@3.0.0-M1` |
1414
| {% endif %} |
1515
| yarn | `npm` | `alpha`, `beta`, `canary`, `dev`, `experimental`, `latest`, `legacy`, `next`, `nightly`, `rc`, `release`, `stable` | `lodash@1.2.0-alpha`, `axios@latest`, `moment@nightly` |
16-
| Bundler | `bundler` | `alpha`, `beta`, `rc`, `pre` | `rails@1.0.0.alpha`, `rack@1.0.0.beta1`, `rspec@1.0.0.rc2` |
16+
| Bundler | `bundler` | Any prerelease identifier (commonly `alpha`, `beta`, `rc`, `pre`) | `rails@1.0.0.alpha`, `rack@1.0.0.beta1`, `rspec@1.0.0.rc2` |
17+
| Cargo | `cargo` | Any SemVer prerelease identifier (commonly `alpha`, `beta`, `rc`, `dev`) | `serde@1.0.0-alpha`, `tokio@0.2.0-preview.3`, `clap@4.0.0-rc.1`, `rand@1.0.0-dev` |
18+
| pip | `pip` | `a`, `b`, `rc`, `dev`, `post` | `requests@1.0.0a1`, `numpy@2.0.0b3`, `django@4.0rc1`, `black@1.0.0.dev5`, `pandas@2.0.5.post1` |
19+
| pipenv | `pip` | `a`, `b`, `rc`, `dev`, `post` | `requests@1.0.0a1`, `numpy@2.0.0b3`, `django@4.0rc1`, `black@1.0.0.dev5`, `pandas@2.0.5.post1` |
20+
| pip-compile | `pip` | `a`, `b`, `rc`, `dev`, `post` | `requests@1.0.0a1`, `numpy@2.0.0b3`, `django@4.0rc1`, `black@1.0.0.dev5`, `pandas@2.0.5.post1` |
21+
| poetry | `pip` | `a`, `b`, `rc`, `dev`, `post` | `requests@1.0.0a1`, `numpy@2.0.0b3`, `django@4.0rc1`, `black@1.0.0.dev5`, `pandas@2.0.5.post1` |
1722

1823
#### Ecosystem-specific versioning details
1924

2025
The following details describe how {% data variables.product.prodname_dependabot %} interprets versioning for specific ecosystems.
2126

2227
* **Bundler:** Bundler does not use a fixed set of prerelease tags. Any version segment containing a letter is treated as a prerelease (for example, `.alpha`, `.beta1`, `.rc2`). Hyphens in version strings are normalized to `.pre.` internally (for example, `1.0.0-beta` becomes `1.0.0.pre.beta`).
28+
* **Cargo:** Follows SemVer 2.0.0 prerelease conventions. Anything after `-` is a prerelease identifier (dot-separated, `[0-9A-Za-z-]`). Build metadata (`+...`) is allowed but ignored for version precedence.
29+
* **pip/pipenv/pip-compile/poetry (PEP 440):** The table lists canonical prerelease and postrelease suffixes per PEP 440. Aliases are also recognized and normalized to their canonical forms (`alpha``a`, `beta``b`, `c`/`pre`/`preview``rc`, `rev`/`r``post`). Epoch versions (`N!...`) and local versions (`+local`) are supported; local version segments are used only to break ties when the public version is identical.

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
e7ee4ef1f3d09323d60d202f335cc24f94d71fa9
1+
6f4199ecdb5aec16a6caafade77d0aab7352d176

0 commit comments

Comments
 (0)