Skip to content

Commit 93d20c1

Browse files
authored
Merge pull request #39138 from github/repo-sync
Repo sync
2 parents dad6d17 + d3b3af0 commit 93d20c1

File tree

16 files changed

+70
-77
lines changed

16 files changed

+70
-77
lines changed

content/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ The {% data variables.product.prodname_codeql %} action supports three different
6464

6565
* `none` - the {% data variables.product.prodname_codeql %} database is created directly from the codebase without building the codebase (supported for all interpreted languages, and additionally supported for {% data variables.code-scanning.no_build_support %}).
6666
* `autobuild` - {% data variables.product.prodname_codeql %} detects the most likely build method and uses this to attempt to build the codebase and create a database for analysis (supported for all compiled languages).
67-
* `manual` - you define the build steps to use for the codebase in the workflow (supported for all compiled languages).
67+
* `manual` - you define the build steps to use for the codebase in the workflow (supported for all compiled languages{% ifversion codeql-rust-public-preview %}, except Rust{% endif %}).
6868

6969
### Comparison of the build modes
7070

content/code-security/code-scanning/introduction-to-code-scanning/about-code-scanning-with-codeql.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ For information about {% data variables.product.prodname_code_scanning %} alerts
5252
{% data reusables.code-scanning.codeql-languages-bullets %}
5353

5454
> [!IMPORTANT]
55-
> {% data variables.product.prodname_codeql %} does **not** support languages that are not listed above. This includes, but is not limited to, **Rust**, **PHP**, **Scala**, and others. Attempting to use {% data variables.product.prodname_codeql %} with unsupported languages may result in no alerts being generated and incomplete analysis.
55+
> {% data variables.product.prodname_codeql %} does **not** support languages that are not listed above. This includes, but is not limited to, **PHP**, **Scala**, and others. Attempting to use {% data variables.product.prodname_codeql %} with unsupported languages may result in no alerts being generated and incomplete analysis.
5656
5757
## Modeling custom or niche frameworks
5858

content/copilot/how-tos/agents/copilot-coding-agent/best-practices-for-using-copilot-to-work-on-tasks.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,12 @@ This is a Go based repository with a Ruby client for certain API endpoints. It i
102102
3. Use dependency injection patterns where appropriate
103103
4. Write unit tests for new functionality. Use table-driven unit tests when possible.
104104
5. Document public APIs and complex logic. Suggest changes to the `docs/` folder when appropriate
105-
```
105+
106+
If you choose not to include a `.github/copilot-instructions.md` file in your repository, {% data variables.product.prodname_copilot_short %} will fall back to pre-existing custom instructions including `CLAUDE.md`, `AGENTS.md` and `GEMINI.md`.
106107

107108
## Using the Model Context Protocol (MCP)
108109

109-
You can extend the capabilities of {% data variables.copilot.copilot_coding_agent %} by using MCP. This allows {% data variables.copilot.copilot_coding_agent %} to use tools provided by local MCP servers. The {% data variables.product.github %} MCP server is enabled by default. For more information, see [AUTOTITLE](/copilot/using-github-copilot/coding-agent/extending-copilot-coding-agent-with-mcp).
110+
You can extend the capabilities of {% data variables.copilot.copilot_coding_agent %} by using MCP. This allows {% data variables.copilot.copilot_coding_agent %} to use tools provided by local and remote MCP servers. The {% data variables.product.github %} MCP server and [Playwright MCP server](https://github.com/microsoft/playwright-mcp) are enabled by default. For more information, see [AUTOTITLE](/copilot/using-github-copilot/coding-agent/extending-copilot-coding-agent-with-mcp).
110111

111112
## Pre-installing dependencies in {% data variables.product.prodname_copilot %}'s environment
112113

@@ -117,7 +118,3 @@ If {% data variables.product.prodname_copilot_short %} is able to build, test an
117118
To do that, it will need your project's dependencies. {% data variables.product.prodname_copilot_short %} can discover and install these dependencies itself via a process of trial and error - but this can be slow and unreliable, given the non-deterministic nature of large language models (LLMs).
118119

119120
You can configure a `copilot-setup-steps.yml` file to pre-install these dependencies before the agent starts working so it can hit the ground running. For more information, see [AUTOTITLE](/copilot/customizing-copilot/customizing-the-development-environment-for-copilot-coding-agent#preinstalling-tools-or-dependencies-in-copilots-environment).
120-
121-
## Further reading
122-
123-
* **Hands-on practice**: Try the [Expand your team with {% data variables.copilot.copilot_coding_agent %}](https://github.com/skills/expand-your-team-with-copilot/) Skills course for practical experience with {% data variables.copilot.copilot_coding_agent %}.

content/copilot/how-tos/agents/copilot-coding-agent/extending-copilot-coding-agent-with-mcp.md

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ redirect_from:
2222
2323
{% data reusables.copilot.coding-agent.mcp-brief-intro %}
2424

25-
The agent can use tools provided by local MCP servers. For example, the [Playwright MCP server](https://github.com/microsoft/playwright-mcp) provides tools to interact with web pages and pull in additional context when executing on the requested task. Some MCP servers are configured by default to provide the best experience for getting started.
25+
The agent can use tools provided by local MCP servers. Some MCP servers are configured by default to provide the best experience for getting started.
2626

2727
For more information on MCP, see [the official MCP documentation](https://modelcontextprotocol.io/introduction). For information on some of the currently available MCP servers, see [the MCP servers repository](https://github.com/modelcontextprotocol/servers/tree/main).
2828

@@ -37,6 +37,9 @@ The following MCP servers are configured automatically for {% data variables.cop
3737
* **{% data variables.product.github %}**: The {% data variables.product.github %} MCP server gives {% data variables.product.prodname_copilot_short %} access to {% data variables.product.github %} data like issues and pull requests. To learn more, see [AUTOTITLE](/copilot/customizing-copilot/using-model-context-protocol/using-the-github-mcp-server).
3838
* By default, the {% data variables.product.github %} MCP server connects to {% data variables.product.github %} using a specially scoped token that only has read-only access to the current repository. You can customize it to use a different token with broader access. For more details, see [Customizing the built-in {% data variables.product.github %} MCP server](#customizing-the-built-in-github-mcp-server) below.
3939

40+
* **Playwright**: The [Playwright MCP server](https://github.com/microsoft/playwright-mcp) gives {% data variables.product.prodname_copilot_short %} access to web pages, including the ability to read, interact and take screenshots.
41+
* By default, the Playwright MCP server is only able to access web resources hosted within {% data variables.product.prodname_copilot_short %}'s own environment, accessible on `localhost` or `127.0.0.1`.
42+
4043
## Setting up MCP servers in a repository
4144

4245
> [!WARNING]
@@ -50,7 +53,7 @@ Once MCP servers are configured for use within a repository, the tools specified
5053

5154
### Creating your JSON MCP configuration
5255

53-
You configure MCP servers using a special JSON format. The JSON must contain an `mcpServers` object, where the key is the name of the MCP server (for example, `playwright`), and the value is an object with the configuration for that MCP server.
56+
You configure MCP servers using a special JSON format. The JSON must contain an `mcpServers` object, where the key is the name of the MCP server (for example, `sentry`), and the value is an object with the configuration for that MCP server.
5457

5558
```json copy
5659
{
@@ -75,29 +78,13 @@ The configuration object can contain the following keys:
7578
* `command` (`string`): The command to run to start the MCP server.
7679
* `args` (`string[]`): The arguments to pass to the `command`.
7780
* `tools` (`string[]`): The tools from the MCP server to enable. You may be able to find a list of tools in the server's documentation, or in its code. We strongly recommend that you allowlist specific read-only tools, since the agent will be able to use these tools autonomously and will not ask you for approval first. You can also enable all tools by including `*` in the array.
78-
* `type` (`string`): Optional field. {% data variables.copilot.copilot_coding_agent %} only accepts `"local"`.
81+
* `type` (`string`): {% data variables.copilot.copilot_coding_agent %} only accepts `"local"`.
7982
* `env` (`object`): The environment variables to pass to the server. This object should map the name of the environment variable that should be exposed to your MCP server to either of the following:
8083
* The name of a {% data variables.product.prodname_actions %} secret you have configured, beginning with `COPILOT_MCP_`.
8184
* A string value.
8285

8386
### Example configurations
8487

85-
#### Example: Playwright
86-
87-
The [Playwright MCP server](https://github.com/microsoft/playwright-mcp) provides tools which allow {% data variables.product.prodname_copilot_short %} to browse the internet.
88-
89-
```json copy
90-
{
91-
"mcpServers": {
92-
"playwright": {
93-
"command": "docker",
94-
"args": ["run", "-i", "--rm", "--init", "mcp/playwright"],
95-
"tools": ["*"]
96-
}
97-
}
98-
}
99-
```
100-
10188
#### Example: Sentry
10289

10390
The [Sentry MCP server](https://github.com/getsentry/sentry-mcp) gives {% data variables.product.prodname_copilot_short %} authenticated access to exceptions recorded in [Sentry](https://sentry.io).
@@ -192,7 +179,7 @@ To use the Azure MCP with {% data variables.copilot.copilot_coding_agent %}, you
192179
1. In your repository’s {% data variables.product.prodname_copilot_short %} environment, add secrets for your `AZURE_CLIENT_ID`, `AZURE_TENANT_ID` and `AZURE_SUBSCRIPTION_ID`.
193180
1. Configure the Azure MCP server by adding an `azure` object to your MCP configuration.
194181

195-
```json copy
182+
```json copy
196183
{
197184
"mcpServers": {
198185
"Azure": {

content/get-started/learning-about-github/github-language-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ Some features are supported for additional languages or package managers. If you
4545
> {% ifversion fpt or ghec %}The language support for {% data variables.product.prodname_copilot %} varies depending on the volume and diversity of training data for that language.{% endif %}
4646
> The support of Gradle for the dependency graph and {% data variables.product.prodname_dependabot_alerts %} is limited to the upload of data obtained using the {% data variables.dependency-submission-api.name %}.
4747
48-
[^1]: PHP, Rust, and Scala are supported for code scanning by third-party actions, but not by {% data variables.product.prodname_codeql %}.
48+
[^1]: {% ifversion codeql-rust-public-preview %}PHP and Scala {% else %}PHP, Rust, and Scala {% endif %}are supported for code scanning by third-party actions, but not by {% data variables.product.prodname_codeql %}.

content/repositories/working-with-files/managing-files/adding-a-file-to-a-repository.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ Your repository may be secured by push protection. With push protection, {% data
4141

4242
{% endif %}
4343

44+
> [!WARNING]
45+
> Use Git to push files to your repository if you need to apply the logic in your `.gitattributes` file. For example, automatic conversion of line endings. Uploading a file through the {% data variables.product.github %} web interface will ignore `.gitattributes`.
46+
4447
{% data reusables.repositories.navigate-to-repo %}
4548
1. Above the list of files, select the **Add file** dropdown menu and click **Upload files**. Alternatively, you can drag and drop files into your browser.
4649

content/rest/campaigns/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: REST API endpoints for security campaigns
3-
shortTitle: Security campaigns
3+
shortTitle: Campaigns
44
intro: Use the REST API to create and manage security campaigns for your organization.
55
topics:
66
- API

content/rest/code-security/index.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
2-
title: Security settings
3-
intro: Use the REST API to create and manage security configurations for your organization.
2+
title: REST API endpoints for code security settings
3+
shortTitle: Code security settings
4+
intro: Use the REST API to create and manage code security configurations for your organization.
45
topics:
56
- API
67
autogenerated: rest
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Reference: #17830
2+
3+
versions:
4+
fpt: '*'
5+
ghec: '*'

data/reusables/code-scanning/codeql-languages-bullets.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
* Java/Kotlin
66
* JavaScript/TypeScript
77
* Python
8-
* Ruby
8+
* Ruby{% ifversion codeql-rust-public-preview %}
9+
* Rust (public preview){% endif %}
910
* Swift
1011
{% ifversion code-scanning-actions-language %}* {% data variables.product.prodname_actions %} workflows{% endif %}
1112

0 commit comments

Comments
 (0)