Skip to content

Commit 426af8d

Browse files
authored
Merge branch 'github:main' into main
2 parents 856a33f + c662d80 commit 426af8d

File tree

2,226 files changed

+432534
-840109
lines changed

Some content is hidden

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

2,226 files changed

+432534
-840109
lines changed

.devcontainer/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/blob/main/containers/javascript-node/.devcontainer/base.Dockerfile
1+
# To find available Node images, see https://mcr.microsoft.com/en-us/product/devcontainers/javascript-node/tags
22

33
# [Choice] Node.js version
4-
ARG VARIANT="18-buster"
5-
FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
4+
ARG VARIANT="dev-20-bullseye"
5+
FROM mcr.microsoft.com/devcontainers/javascript-node:${VARIANT}
66

77
# [Optional] Uncomment this section to install additional OS packages.
88
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"build": {
77
"dockerfile": "Dockerfile",
88
// Update 'VARIANT' to pick a Node version
9-
"args": { "VARIANT": "18" }
9+
"args": { "VARIANT": "20" }
1010
},
1111

1212
// Set *default* container specific settings.json values on container create.

.eslintrc.cjs

Lines changed: 0 additions & 62 deletions
This file was deleted.

.github/CODEOWNERS

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,4 @@ src/ghes-releases/lib/enterprise-dates.json @github/docs-content-enterprise
1414
content/actions/deployment/security-hardening-your-deployments/** @github/oidc
1515

1616
# RAI - CELA
17-
data/reusables/copilot/about-copilot-chat.md @github/legal-product
18-
content/copilot/github-copilot-in-the-cli/about-github-copilot-in-the-cli.md @github/legal-product
19-
20-
content/code-security/secret-scanning/about-the-regular-expression-generator-for-custom-patterns @github/legal-product
21-
data/reusables/secret-scanning/beta-custom-pattern-regular-expression-generator.md @github/legal-product
22-
23-
content/code-security/secret-scanning/about-the-detection-of-generic-secrets-with-secret-scanning.md @github/legal-product
24-
data/reusables/secret-scanning/generic-secret-detection-ai.md @github/legal-product
25-
26-
content/code-security/code-scanning/managing-code-scanning-alerts/about-autofix-for-codeql-code-scanning.md @github/legal-product
27-
data/reusables/rai/ @github/legal-product
28-
29-
content/copilot/github-copilot-enterprise/copilot-pull-request-summaries/about-copilot-pull-request-summaries.md @github/legal-product
17+
data/reusables/rai/** @github/legal-product
File renamed without changes.

CONTRIBUTING.md renamed to .github/CONTRIBUTING.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ Use the table of contents icon <img src="/contributing/images/table-of-contents.
1313
To get an overview of the project, read the [README](README.md) file. Here are some resources to help you get started with open source contributions:
1414

1515
- [Finding ways to contribute to open source on GitHub](https://docs.github.com/en/get-started/exploring-projects-on-github/finding-ways-to-contribute-to-open-source-on-github)
16-
- [Set up Git](https://docs.github.com/en/get-started/quickstart/set-up-git)
17-
- [GitHub flow](https://docs.github.com/en/get-started/quickstart/github-flow)
16+
- [Set up Git](https://docs.github.com/en/get-started/getting-started-with-git/set-up-git)
17+
- [GitHub flow](https://docs.github.com/en/get-started/using-github/github-flow)
1818
- [Collaborating with pull requests](https://docs.github.com/en/github/collaborating-with-pull-requests)
1919

2020

2121
## Getting started
2222

23-
To navigate our codebase with confidence, see [the introduction to working in the docs repository](/contributing/working-in-docs-repository.md) :confetti_ball:. For more information on how we write our markdown files, see [the GitHub Markdown reference](contributing/content-markup-reference.md).
23+
To navigate our codebase with confidence, see [the introduction to working in the docs repository](/contributing/README.md) :confetti_ball:. For more information on how we write our markdown files, see "[Using Markdown and Liquid in GitHub Docs](https://docs.github.com/en/contributing/writing-for-github-docs/using-markdown-and-liquid-in-github-docs).
2424

2525
Check to see what [types of contributions](/contributing/types-of-contributions.md) we accept before making changes. Some of them don't even require writing a single line of code :sparkles:.
2626

@@ -32,7 +32,7 @@ If you spot a problem with the docs, [search if an issue already exists](https:/
3232

3333
#### Solve an issue
3434

35-
Scan through our [existing issues](https://github.com/github/docs/issues) to find one that interests you. You can narrow down the search using `labels` as filters. See [Labels](/contributing/how-to-use-labels.md) for more information. As a general rule, we don’t assign issues to anyone. If you find an issue to work on, you are welcome to open a PR with a fix.
35+
Scan through our [existing issues](https://github.com/github/docs/issues) to find one that interests you. You can narrow down the search using `labels` as filters. See "[Label reference](https://docs.github.com/en/contributing/collaborating-on-github-docs/label-reference)" for more information. As a general rule, we don’t assign issues to anyone. If you find an issue to work on, you are welcome to open a PR with a fix.
3636

3737
### Make Changes
3838

@@ -62,7 +62,7 @@ For more information about using a codespace for working on GitHub documentation
6262

6363
### Commit your update
6464

65-
Commit the changes once you are happy with them. Don't forget to [self-review](/contributing/self-review.md) to speed up the review process:zap:.
65+
Commit the changes once you are happy with them. Don't forget to use the "[Self review checklist](https://docs.github.com/en/contributing/collaborating-on-github-docs/self-review-checklist) to speed up the review process :zap:.
6666

6767
### Pull Request
6868

.github/ISSUE_TEMPLATE/improve-existing-docs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ body:
1818
label: Code of Conduct
1919
description: This project has a Code of Conduct that all participants are expected to understand and follow.
2020
options:
21-
- label: I have read and agree to the GitHub Docs project's [Code of Conduct](https://github.com/github/docs/blob/main/CODE_OF_CONDUCT.md)
21+
- label: I have read and agree to the GitHub Docs project's [Code of Conduct](https://github.com/github/docs/blob/main/.github/CODE_OF_CONDUCT.md)
2222
required: true
2323

2424
- type: textarea

.github/ISSUE_TEMPLATE/partner-contributed-documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ body:
3939
required: true
4040
- label: MUST emphasize how the third-party product works with GitHub.
4141
required: true
42-
- label: MUST be written in Markdown format, using [one of the templates provided](contributing/github-partners/README.md#templates).
42+
- label: MUST be written in Markdown format, using [one of the templates provided](https://docs.github.com/en/contributing/writing-for-github-docs/templates).
4343
required: true
4444
- label: MUST include the name and URL of the GitHub technology partner responsible for maintenance of the documentation being contributed. This should be added via the `contributor.name` and `contributor.URL` properties in the template's YAML frontmatter.
4545
required: true

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ If you made changes to the `content` directory, a table will populate in a comme
1616

1717
### Check off the following:
1818

19-
- [ ] I have reviewed my changes in staging, available via the **View deployment** link in this PR's timeline.
19+
- [ ] I have reviewed my changes in staging, available via the **View deployment** link in this PR's timeline (this link will be available after opening the PR).
2020

2121
- For content changes, you will also see an automatically generated comment with links directly to pages you've modified. The comment won't appear if your PR only edits files in the `data` directory.
22-
- [ ] For content changes, I have completed the [self-review checklist](https://github.com/github/docs/blob/main/contributing/self-review.md#self-review).
22+
- [ ] For content changes, I have completed the [self-review checklist](https://docs.github.com/en/contributing/collaborating-on-github-docs/self-review-checklist).
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: Warmup pageinfo cache
2+
3+
description: Run this to create a .pageinfo-cache.json.br file
4+
5+
inputs:
6+
restore-only:
7+
description: Only attempt to restore, don't warm up
8+
required: false
9+
10+
runs:
11+
using: 'composite'
12+
steps:
13+
# The caching technique here is to "unboundedly" add to the cache.
14+
# By unboundedly, it means the cached item will grow and grow.
15+
# The general idea is that we A) restore from cache, B) replace the
16+
# file by running the script, and C) save the file back to cache.
17+
# Optionally, you can have it just do A (and not B and C).
18+
19+
- name: Cache .pageinfo-cache.json.br (restore)
20+
# You can't use a SHA on these. Only possible with `actions/cache@SHA...`
21+
uses: actions/cache/restore@v3
22+
with:
23+
path: .pageinfo-cache.json.br
24+
key: pageinfo-cache-
25+
restore-keys: pageinfo-cache-
26+
27+
# When we use this composite action from the workflows like
28+
# Azure Preview Deploy and Azure Production Deploy, we don't have
29+
# any Node installed or any of its packages. I.e. we never
30+
# run `npm ci` in those actions. For security sake.
31+
# So we can't do things that require Node code.
32+
# Tests and others will omit the `restore-only` input, but
33+
# prepping for Docker build and push, will set it to a non-empty
34+
# string which basically means "If you can restore it, great.
35+
# If not, that's fine, don't bother".
36+
- name: Run script
37+
if: ${{ inputs.restore-only == '' }}
38+
shell: bash
39+
run: npm run precompute-pageinfo
40+
41+
- name: Cache .remotejson-cache (save)
42+
if: ${{ inputs.restore-only == '' }}
43+
uses: actions/cache/save@v3
44+
with:
45+
path: .pageinfo-cache.json.br
46+
key: pageinfo-cache-${{ github.sha }}

0 commit comments

Comments
 (0)