Skip to content

Commit b422dcf

Browse files
authored
Merge pull request #63220 from github/repo-sync
Repo sync
2 parents 0357b73 + ffb6901 commit b422dcf

6 files changed

Lines changed: 36 additions & 21 deletions

File tree

‎content/copilot/how-tos/copilot-cli/customize-copilot/use-byok-models.md‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,13 @@ You configure your model provider by setting environment variables before starti
4949
| `COPILOT_PROVIDER_BASE_URL` | Yes | The base URL of your model provider's API endpoint. |
5050
| `COPILOT_PROVIDER_TYPE` | No | The provider type: `openai` (default), `azure`, or `anthropic`. |
5151
| `COPILOT_PROVIDER_API_KEY` | No | Your API key for the provider. Not required for providers that do not use authentication, such as a local Ollama instance. |
52+
| `COPILOT_PROVIDER_BEARER_TOKEN` | No | Bearer token used for provider authentication when API-key authentication is not used. |
53+
| `COPILOT_PROVIDER_WIRE_API` | No | Specifies the API protocol used when communicating with the provider. |
54+
| `COPILOT_PROVIDER_AZURE_API_VERSION` | Azure only | The Azure OpenAI API version used for requests. |
55+
| `COPILOT_PROVIDER_MODEL_ID` | No | The well-known model name used to identify model capabilities and token limits. |
56+
| `COPILOT_PROVIDER_WIRE_MODEL` | No | The model name sent to the provider API for inference. For Azure OpenAI, use the deployment name. |
57+
| `COPILOT_PROVIDER_MAX_PROMPT_TOKENS` | No | Maximum number of prompt tokens allowed in a request. |
58+
| `COPILOT_PROVIDER_MAX_OUTPUT_TOKENS` | No | Maximum number of tokens generated in a response. |
5259
| `COPILOT_MODEL` | Yes | The model identifier to use. You can also set this with the `--model` command-line flag. |
5360

5461
## Connecting to an OpenAI-compatible endpoint
@@ -81,17 +88,29 @@ Use the following steps if you are connecting to OpenAI, Ollama, vLLM, Foundry L
8188
1. Set the environment variables for Azure OpenAI.
8289

8390
```shell
84-
export COPILOT_PROVIDER_BASE_URL=https://YOUR-RESOURCE-NAME.openai.azure.com/openai/deployments/YOUR-DEPLOYMENT-NAME
91+
export COPILOT_PROVIDER_BASE_URL=https://YOUR-RESOURCE-NAME.openai.azure.com
8592
export COPILOT_PROVIDER_TYPE=azure
8693
export COPILOT_PROVIDER_API_KEY=YOUR-AZURE-API-KEY
94+
export COPILOT_PROVIDER_AZURE_API_VERSION=YOUR-AZURE-API-VERSION
95+
export COPILOT_PROVIDER_MODEL_ID=YOUR-MODEL-NAME
96+
export COPILOT_PROVIDER_WIRE_MODEL=YOUR-DEPLOYMENT-NAME
8797
export COPILOT_MODEL=YOUR-DEPLOYMENT-NAME
8898
```
8999

90100
Replace the following placeholders:
91101

92-
* `YOUR-RESOURCE-NAME`: your Azure OpenAI resource name
93-
* `YOUR-DEPLOYMENT-NAME`: the name of your model deployment
94-
* `YOUR-AZURE-API-KEY`: your Azure OpenAI API key
102+
* `YOUR-RESOURCE-NAME`: your Azure OpenAI resource name
103+
* `YOUR-DEPLOYMENT-NAME`: the deployment name that receives requests
104+
* `YOUR-MODEL-NAME`: the underlying model associated with the deployment (for example, `gpt-4o`)
105+
* `YOUR-AZURE-API-VERSION`: the Azure OpenAI API version
106+
* `YOUR-AZURE-API-KEY`: your Azure OpenAI API key
107+
108+
### Azure-specific environment variables
109+
110+
| Variable | Description |
111+
|---|---|
112+
| `COPILOT_PROVIDER_MODEL_ID` | The well-known model name. {% data variables.copilot.copilot_cli_short %} uses this value to identify model capabilities and token limits. |
113+
| `COPILOT_PROVIDER_WIRE_MODEL` | The Azure OpenAI deployment name. Azure OpenAI routes requests through deployments rather than directly through model names. |
95114

96115
{% data reusables.copilot.copilot-cli.start-cli %}
97116

‎content/copilot/how-tos/copilot-on-github/customize-copilot/customize-cloud-agent/customize-the-agent-environment.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ A `copilot-setup-steps.yml` file looks like a normal {% data variables.product.p
5151
5252
Here is a simple example of a `copilot-setup-steps.yml` file for a TypeScript project that clones the project, installs Node.js and downloads and caches the project's dependencies. You should customize this to fit your own project, including its language(s), its dependencies, and the workflow triggers you need. For example, you wouldn't typically run on both `push` and `pull_request`.
5353

54-
```yaml copy
54+
```yaml
5555
name: "Copilot Setup Steps"
5656

5757
# Automatically run the setup steps when they are changed to allow for easy validation, and

‎content/copilot/tutorials/cloud-agent/improve-a-project.md‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ Creating this file is optional but is a good idea if you use {% data variables.c
7979

8080
<!-- markdownlint-disable -->
8181
```text copy
82-
Analyze this repository to understand the dependencies that need to be installed on the development environment to work on the code in this repository. Using this information, and the details about the `copilot-setup-steps.yml` file that are given in https://docs.github.com/copilot/how-tos/use-copilot-agents/cloud-agent/customize-the-agent-environment, add a `.github/workflows/copilot-setup-steps.yml` to this repository. This Actions workflow file should install, in the development environment for {% data variables.copilot.copilot_cloud_agent %}, all of the dependencies necessary to work on the code in this repository. Make sure that the workflow job is named `copilot-setup-steps`.
82+
Analyze this repository to understand the dependencies that need to be installed on the development environment to work on the code in this repository. Using this information, and the details about the `copilot-setup-steps.yml` file that are given in https://docs.github.com/copilot/how-tos/use-copilot-agents/cloud-agent/customize-the-agent-environment, add a `.github/workflows/copilot-setup-steps.yml` to this repository. This Actions workflow file should install, in the development environment for {% data variables.copilot.copilot_cloud_agent %}, all of the dependencies necessary to work on the code in this repository. Make sure that the workflow job is named `copilot-setup-steps`, and that the workflow includes a `workflow_dispatch` trigger so that it can be run manually. Choose any other triggers to suit this repository; there's no need to run on both `push` and `pull_request`.
8383
```
8484
<!-- markdownlint-enable -->
8585

@@ -97,12 +97,6 @@ Creating this file is optional but is a good idea if you use {% data variables.c
9797
```yaml
9898
on:
9999
workflow_dispatch:
100-
push:
101-
paths:
102-
- .github/workflows/copilot-setup-steps.yml
103-
pull_request:
104-
paths:
105-
- .github/workflows/copilot-setup-steps.yml
106100

107101
jobs:
108102
copilot-setup-steps:

‎content/packages/working-with-a-github-packages-registry/working-with-the-npm-registry.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ If your instance has subdomain isolation enabled:
6969
{% endif %}
7070

7171
```shell
72-
//{% ifversion fpt or ghec %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %}/:_authToken=TOKEN
72+
//{% ifversion fpt or ghec %}npm.pkg.github.com{% else %}npm.HOSTNAME{% endif %}/:_authToken=TOKEN
7373
```
7474

7575
{% ifversion ghes %}
@@ -161,7 +161,7 @@ You can use `publishConfig` element in the `package.json` file to specify the re
161161

162162
```shell
163163
"publishConfig": {
164-
"registry": "https://{% ifversion fpt or ghec %}npm.pkg.github.com{% else %}npm. HOSTNAME/{% endif %}"
164+
"registry": "https://{% ifversion fpt or ghec %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %}"
165165
},
166166
```
167167

@@ -225,23 +225,23 @@ You also need to add the `.npmrc` file to your project so that all requests to i
225225

226226
### Installing packages from other organizations
227227

228-
By default, you can only use {% data variables.product.prodname_registry %} packages from one organization. If you'd like to route package requests to multiple organizations and users, you can add additional lines to your `.npmrc` file, replacing {% ifversion ghes %}`HOSTNAME` with the host name of {% data variables.location.product_location %} and {% endif %}`NAMESPACE` with the name of the personal account or organization {% ifversion packages-npm-v2 %}to which the package is scoped{% else %}that owns the repository containing the project{% endif %}.
228+
By default, you can only use {% data variables.product.prodname_registry %} packages from one organization. If you'd like to route package requests to multiple organizations and users, you can add additional lines to your `.npmrc` file, replacing {% ifversion ghes %}`HOSTNAME` with the host name of {% data variables.location.product_location %} and {% endif %}`NAMESPACE1` and `NAMESPACE2` with the names of the personal accounts or organizations {% ifversion packages-npm-v2 %}to which the packages are scoped{% else %}that own the repositories containing the projects{% endif %}.
229229

230230
{% ifversion ghes %}
231231
If your instance has subdomain isolation enabled:
232232
{% endif %}
233233

234234
```shell
235-
@NAMESPACE:registry=https://{% ifversion fpt or ghec %}npm.pkg.github.com{% else %}npm.HOSTNAME{% endif %}
236-
@NAMESPACE:registry=https://{% ifversion fpt or ghec %}npm.pkg.github.com{% else %}npm.HOSTNAME{% endif %}
235+
@NAMESPACE1:registry=https://{% ifversion fpt or ghec %}npm.pkg.github.com{% else %}npm.HOSTNAME{% endif %}
236+
@NAMESPACE2:registry=https://{% ifversion fpt or ghec %}npm.pkg.github.com{% else %}npm.HOSTNAME{% endif %}
237237
```
238238

239239
{% ifversion ghes %}
240240
If your instance has subdomain isolation disabled:
241241

242242
```shell
243-
@NAMESPACE:registry=https://HOSTNAME/_registry/npm
244-
@NAMESPACE:registry=https://HOSTNAME/_registry/npm
243+
@NAMESPACE1:registry=https://HOSTNAME/_registry/npm
244+
@NAMESPACE2:registry=https://HOSTNAME/_registry/npm
245245
```
246246

247247
{% endif %}

‎content/pages/configuring-a-custom-domain-for-your-github-pages-site/managing-a-custom-domain-for-your-github-pages-site.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,8 @@ To set up a `www` or custom subdomain, such as `www.example.com` or `blog.exampl
123123

124124
1. Navigate to your DNS provider and create a `CNAME` record that points your subdomain to the default domain for your site. For example, if you want to use the subdomain `www.example.com` for your user site, create a `CNAME` record that points `www.example.com` to `<user>.github.io`. If you want to use the subdomain `another.example.com` for your organization site, create a `CNAME` record that points `another.example.com` to `<organization>.github.io`. The `CNAME` record should always point to `<user>.github.io` or `<organization>.github.io`, excluding the repository name. {% data reusables.pages.contact-dns-provider %} {% data reusables.pages.default-domain-information %}
125125

126+
These `CNAME` record values are the same for both publicly and privately published {% data variables.product.prodname_pages %} sites. Do not point the `CNAME` record to the unique `*.pages.github.io` subdomain shown in your repository's {% data variables.product.prodname_pages %} settings. Privately published sites are available with {% data variables.product.prodname_ghe_cloud %}. For more information, see [AUTOTITLE](/enterprise-cloud@latest/pages/getting-started-with-github-pages/changing-the-visibility-of-your-github-pages-site){% ifversion fpt %} in the {% data variables.product.prodname_ghe_cloud %} documentation{% endif %}.
127+
126128
{% indented_data_reference reusables.pages.wildcard-dns-warning spaces=3 %}
127129
{% data reusables.command_line.open_the_multi_os_terminal %}
128130
1. To confirm that your DNS record configured correctly, use the `dig` command, replacing _WWW.EXAMPLE.COM_ with your subdomain.

‎content/pull-requests/get-started/reviewing-pull-requests-quickstart.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ When you know the exact change you'd like, suggest it so the author can apply it
3939

4040
Finish by submitting your review with a decision that tells the author what to do next.
4141

42-
1. Click **Review changes**.
42+
1. Click **Submit review**.
4343
1. Add a summary comment.
4444
1. Select a decision, then click **Submit review**:
4545

@@ -50,4 +50,4 @@ Finish by submitting your review with a decision that tells the author what to d
5050
## Next steps
5151

5252
* [AUTOTITLE](/pull-requests/concepts/giving-reviews)
53-
* [AUTOTITLE](/pull-requests/reference/pull-request-reviews)
53+
* [AUTOTITLE](/pull-requests/reference/pull-request-reviews)

0 commit comments

Comments
 (0)