Skip to content

Commit 2367eba

Browse files
authored
Merge branch 'main' into patch-10
2 parents ed933b7 + 806d0b0 commit 2367eba

File tree

424 files changed

+91775
-6577
lines changed

Some content is hidden

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

424 files changed

+91775
-6577
lines changed

.devcontainer/devcontainer.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,13 @@
5959
},
6060

6161
// Lifecycle commands
62-
"onCreateCommand": "npm ci",
62+
// Install dependencies then install Copilot CLI
63+
"onCreateCommand": "npm ci && npm config set \"//npm.pkg.github.com/:_authToken=$GITHUB_TOKEN\" && npm config set \"@github:registry=https://npm.pkg.github.com/\" && npm install -g @github/copilot",
64+
// Start a web server and keep it running
6365
"postStartCommand": "nohup bash -c 'npm start &'",
64-
// Set the port to be public
66+
// Set port 4000 to be public
6567
"postAttachCommand": "gh cs ports visibility 4000:public -c \"$CODESPACE_NAME\"",
66-
68+
6769
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
6870
"remoteUser": "node",
6971

.github/workflows/create-changelog-pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
core.setOutput('pull-request-number', pullRequest.number);
123123
core.setOutput('pull-request-url', pullRequest.html_url);
124124
125-
- name: Add 'ready-for-doc-review' label to PR
125+
- name: Add 'ready-for-doc-review' and 'skip FR board' labels to PR
126126
if: env.CONTINUE_WORKFLOW == 'true'
127127
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd
128128
env:
@@ -135,7 +135,7 @@ jobs:
135135
owner: context.repo.owner,
136136
repo: context.repo.repo,
137137
issue_number: Number(process.env.PULL_REQUEST_NUMBER),
138-
labels: ['ready-for-doc-review']
138+
labels: ['ready-for-doc-review','skip FR board']
139139
});
140140
141141
- name: Assign PR to commenter

.github/workflows/local-dev.yml

Lines changed: 18 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
name: Local development
22

3-
# **What it does**: Can you start the local server like a writer would do?
4-
# **Why we have it**: Our CI is often heavily geared on testing in "production"
5-
# that historically we've been known to break local
6-
# development sometimes.
3+
# **What it does**: Basic smoke test to ensure local dev server starts and serves content
4+
# **Why we have it**: Catch catastrophic "npm start is completely broken" scenarios
75
# **Who does it impact**: Engineers, Contributors.
86

97
on:
@@ -28,76 +26,25 @@ jobs:
2826
with:
2927
token: ${{ secrets.DOCS_BOT_PAT_BASE }}
3028

31-
# Note that we don't check out docs-early-access, Elasticsearch,
32-
# or any remote translations. Nothing fancy here!
33-
3429
- name: Disable Next.js telemetry
3530
run: npx next telemetry disable
3631

37-
- name: Install headless browser
38-
run: npx playwright install --no-shell
39-
40-
# The Playwright test, with the env vars we set here, takes care of
41-
# starting a server and shutting it down when it's done.
42-
# That's why it's important this step comes before the `npm start &`
43-
# step below.
44-
- name: Run Playwright tests
45-
env:
46-
# This is what local dev contributors are expected to do.
47-
PLAYWRIGHT_START_SERVER_COMMAND: 'npm start'
48-
# This is so that timeouts aren't retried, which can lead to
49-
# tests not exiting at the end with a non-zero. Otherwise,
50-
# by default failures are marked as "flaky" instead of "failed".
51-
PLAYWRIGHT_RETRIES: 0
52-
TEST_EARLY_ACCESS: ${{ github.repository == 'github/docs-internal' }}
53-
# workaround for https://github.com/nodejs/node/issues/59364 as of 22.18.0
54-
NODE_OPTIONS: '--no-experimental-strip-types --max-old-space-size=8192'
55-
run: npm run playwright-test -- playwright-local-dev
56-
57-
- name: Start server in the background
58-
run: npm start > /tmp/stdout.log 2> /tmp/stderr.log &
59-
60-
- name: View the home page
61-
run: |
62-
echo "Going to sleep a little to wait for the server to start"
63-
sleep 10
64-
curl --fail --retry-connrefused --retry 5 http://localhost:4000/
65-
66-
- name: Run basic tests
67-
run: npm run test-local-dev
68-
69-
- if: ${{ failure() }}
70-
name: Debug server outputs on errors
32+
- name: Start server and basic smoke test
7133
run: |
72-
echo "____STDOUT____"
73-
cat /tmp/stdout.log
74-
echo "____STDERR____"
75-
cat /tmp/stderr.log
76-
77-
- name: Pre-commit hooks should prevent bad Markdown edits
78-
run: |
79-
set -e
80-
81-
# This test assumes this one file always exists
82-
ls content/get-started/start-your-journey/hello-world.md
83-
84-
# Not sure if it matters but we're in a detached HEAD state
85-
# after the actions/checkout action.
86-
git checkout -b my-new-branch
87-
# Also, do this so you don't get errors from git about this
88-
# not being set up before your first commit attempt
89-
git config user.name github-actions
90-
git config user.email github-actions@github.com
91-
92-
# To know what will fail the markdown lint, see src/content-linter/style/github-docs.js
93-
# Add some NOT valid Markdown to it
94-
# In this case an internal link with a hardcode /en/ prefix.
95-
echo "This *is** not valid [Markdown](/en/foo)" >> content/get-started/start-your-journey/hello-world.md
96-
git commit -a -m "this should fail"
97-
exit_code=$?
98-
if [ $exit_code != 0 ]; then
99-
echo "That SHOULD have failed, but it DIDN'T"
100-
exit 1
34+
# Start server in background
35+
npm start > /tmp/stdout.log 2> /tmp/stderr.log &
36+
SERVER_PID=$!
37+
38+
# Wait for server to be ready and test homepage
39+
if curl --fail --retry-connrefused --retry 10 --retry-delay 2 http://localhost:4000/; then
40+
echo "✅ Local dev server started successfully and serves homepage"
41+
kill $SERVER_PID 2>/dev/null || true
10142
else
102-
echo "As expected, it failed :)"
43+
echo "❌ Local dev server failed to start or serve content"
44+
echo "____STDOUT____"
45+
cat /tmp/stdout.log
46+
echo "____STDERR____"
47+
cat /tmp/stderr.log
48+
kill $SERVER_PID 2>/dev/null || true
49+
exit 1
10350
fi

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
2525
with:
2626
repo-token: ${{ secrets.GITHUB_TOKEN }}
27-
stale-pr-message: "It looks as if this pull request has been inactive for 30 days. We want to check in with you to see if you plan to continue working on it. If you do, please add a comment to let us know. If we don't hear from you, we will close this pull request after 14 days."
27+
stale-pr-message: "It looks as if this pull request has been inactive for 30 days. We want to check in with you to see if you plan to continue working on it. If you do, please add a comment to let us know. If we don't hear from you, we will close this pull request after 14 days. If the PR has been reviewed by a writer and you think it's ready to merge, drop into [#docs-content](https://github-grid.enterprise.slack.com/archives/C0E9DK082) and ask us to merge it."
2828
days-before-stale: 30
2929
days-before-close: 14
3030
stale-pr-label: 'stale'

CHANGELOG.md

Lines changed: 55 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,58 @@
11
# Docs changelog
22

3+
**25 September 2025**
4+
5+
We've updated the documentation for the GA release of [Copilot Spaces](https://github.com/copilot/spaces). Spaces allow you to organize and centralize content and resources in order to ground Copilot Chat's responses in that context and share knowledge across teams. You can now also access Copilot Spaces in your IDE via the GitHub MCP server.
6+
7+
See the updated docs:
8+
* [About organizing and sharing context with GitHub Copilot Spaces](https://docs.github.com/copilot/concepts/context/spaces)
9+
* [Creating GitHub Copilot Spaces](https://docs.github.com/copilot/how-tos/provide-context/use-copilot-spaces/create-copilot-spaces)
10+
* [Using GitHub Copilot Spaces](https://docs.github.com/copilot/how-tos/provide-context/use-copilot-spaces/use-copilot-spaces)
11+
12+
<hr>
13+
14+
**24 September 2025**
15+
16+
Until now, assigning Copilot coding agent to an issue was limited to the same repository as the issue.
17+
18+
You can now:
19+
20+
* Assign Copilot coding agent to work in a different repository, supporting workflows where issues and code files are managed separately.
21+
* Provide additional instructions to tailor the agent's output to your requirements.
22+
* Choose the base branch for the agent to use.
23+
24+
These changes provide a more flexible, transparent, and user-friendly experience for managing automated coding tasks with Copilot coding agent.
25+
26+
See the updated docs: [Using GitHub Copilot to work on an issue](https://docs.github.com/copilot/how-tos/use-copilot-agents/coding-agent/assign-copilot-to-an-issue#assigning-an-issue-to-copilot).
27+
28+
<hr>
29+
30+
**23 September 2025**
31+
32+
We've added new documentation for Spark that answers some common customer questions, helps customers troubleshoot known issues, and guides users on the best ways to prompt and provide context to Spark.
33+
34+
See:
35+
- [About GitHub Spark](https://docs.github.com/copilot/concepts/spark)
36+
- [Troubleshooting common issues with GitHub Spark](https://docs.github.com/copilot/how-tos/troubleshoot-copilot/troubleshoot-spark)
37+
- [Write effective prompts and provide useful context for Spark](https://docs.github.com/copilot/tutorials/spark/prompt-tips)
38+
39+
<hr>
40+
41+
**17 September 2025**
42+
43+
We've added information about the GitHub MCP Registry, and guidance on how to use it in VS Code.
44+
45+
See [About the GitHub MCP Registry](https://docs.github.com/copilot/concepts/context/mcp#about-the-github-mcp-registry) and [Using the GitHub MCP Registry](https://docs.github.com/copilot/how-tos/provide-context/use-mcp/extend-copilot-chat-with-mcp#using-the-github-mcp-registry).
46+
47+
<hr>
48+
349
**17 September 2025**
450

5-
We added documentation for expanded features for reusing workflow configurations in GitHub Actions.
51+
We've added documentation for expanded features for reusing workflow configurations in GitHub Actions.
652

7-
You can now use YAML anchors and aliases to reuse pieces of content in a workflow. See [YAML anchors and aliases](https://docs.github.com/en/actions/concepts/workflows-and-actions/reusing-workflow-configurations#yaml-anchors-and-aliases).
53+
You can now use YAML anchors and aliases to reuse pieces of content in a workflow. See [YAML anchors and aliases](https://docs.github.com/actions/concepts/workflows-and-actions/reusing-workflow-configurations#yaml-anchors-and-aliases).
854

9-
To keep the content focused on users' job-to-be-done, we simplified the procedures for [creating workflow templates for your organization](https://docs.github.com/en/actions/how-tos/reuse-automations/create-workflow-templates). In addition, we updated reference documentation for workflow templates with details on permissions, repository visibility rules, rules for the metadata file, and examples. See [Workflow templates](https://docs.github.com/en/actions/reference/workflows-and-actions/reusing-workflow-configurations#workflow-templates).
55+
To keep the content focused on users' job-to-be-done, we simplified the procedures for [creating workflow templates for your organization](https://docs.github.com/actions/how-tos/reuse-automations/create-workflow-templates). In addition, we updated reference documentation for workflow templates with details on permissions, repository visibility rules, rules for the metadata file, and examples. See [Workflow templates](https://docs.github.com/actions/reference/workflows-and-actions/reusing-workflow-configurations#workflow-templates).
1056

1157
<hr>
1258

@@ -16,7 +62,7 @@ You can now publish your Spark app as "read-only."
1662

1763
By default, data stored in Spark is shared across all users of the app. You can choose to publish your app as "read-only" if you want to showcase your app to others, but you don't want others to be able to edit or delete any stored data.
1864

19-
We've updated the [Spark documentation](https://docs.github.com/en/copilot/tutorials/build-apps-with-spark) accordingly.
65+
We've updated the [Spark documentation](https://docs.github.com/copilot/tutorials/build-apps-with-spark) accordingly.
2066

2167
<hr>
2268

@@ -32,7 +78,7 @@ See [Responsible use of GitHub Copilot code review](https://docs.github.com/copi
3278

3379
Copilot Chat in VS Code includes a "Manage models" option which allows you to add models from a variety of LLM providers, such as Azure, Anthropic, Google, and xAI. By installing the AI Toolkit for VS Code, you can install even more models from the "Manage models" option. We've updated the documentation to include details of how to use this new feature.
3480

35-
See [Changing the AI model for GitHub Copilot Chat](https://docs.github.com/en/copilot/how-tos/use-ai-models/change-the-chat-model?tool=vscode).
81+
See [Changing the AI model for GitHub Copilot Chat](https://docs.github.com/copilot/how-tos/use-ai-models/change-the-chat-model?tool=vscode).
3682

3783
<hr>
3884

@@ -46,9 +92,9 @@ See [Configuring automatic code review by GitHub Copilot](https://docs.github.co
4692

4793
**8 September 2025**
4894

49-
We've added a tutorial on planning a project with GitHub Copilot, including creating issues and sub-issues: [Planning a project with GitHub Copilot](https://docs.github.com/en/copilot/tutorials/plan-a-project). This tutorial provides step-by-step instructions on leveraging Copilot to plan a project from scratch.
95+
We've added a tutorial on planning a project with GitHub Copilot, including creating issues and sub-issues: [Planning a project with GitHub Copilot](https://docs.github.com/copilot/tutorials/plan-a-project). This tutorial provides step-by-step instructions on leveraging Copilot to plan a project from scratch.
5096

51-
Additionally, we've updated [Using GitHub Copilot to create issues](https://docs.github.com/en/copilot/how-tos/use-copilot-for-common-tasks/use-copilot-to-create-issues) with instructions to create sub-issues and to work with existing issues.
97+
Additionally, we've updated [Using GitHub Copilot to create issues](https://docs.github.com/copilot/how-tos/use-copilot-for-common-tasks/use-copilot-to-create-issues) with instructions to create sub-issues and to work with existing issues.
5298

5399
<hr>
54100

@@ -66,7 +112,7 @@ See: [Configure custom instructions for GitHub Copilot](https://docs.github.com/
66112

67113
In addition to repository-wide custom instructions, specified in the `.github/copilot-instructions.md` file, Copilot Code Review now supports:
68114

69-
* Path-specific custom instructions, specified in `.github/instructions/NAME.instructions.md` files.
115+
* Path-specific custom instructions, specified in `.github/instructions/**/NAME.instructions.md` files.
70116
* Custom instructions specified in the organization settings for Copilot.
71117

72118
We have updated several articles in the GitHub documentation accordingly. We have also made changes to clarify the difference between the various types of custom instructions for Copilot Code Review, Copilot Chat, and Copilot Coding Agent.
@@ -77,7 +123,7 @@ For example, see: [Adding repository custom instructions for GitHub Copilot](htt
77123

78124
**3 September 2025**
79125

80-
We’ve updated [Choosing your enterprise’s plan for GitHub Copilot](https://docs.github.com/en/copilot/get-started/choose-enterprise-plan) to better highlight the long-term benefits of the Copilot Enterprise (CE) plan. The updated content focuses on the key advantages of CE, such as increased access to premium requests and earlier availability of new models.
126+
We’ve updated [Choosing your enterprise’s plan for GitHub Copilot](https://docs.github.com/copilot/get-started/choose-enterprise-plan) to better highlight the long-term benefits of the Copilot Enterprise (CE) plan. The updated content focuses on the key advantages of CE, such as increased access to premium requests and earlier availability of new models.
81127

82128
<hr>
83129

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:20250911-223345-ge6d335835 AS base
11+
FROM ghcr.io/github/gh-base-image/gh-base-noble:20250929-093120-g65a62eb8c 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
41.1 KB
Loading
187 KB
Loading
79.1 KB
Loading
-34.8 KB
Binary file not shown.

0 commit comments

Comments
 (0)