Skip to content

Commit db7d2cc

Browse files
authored
Merge branch 'main' into patch-3
2 parents 07e6a31 + d78ed30 commit db7d2cc

File tree

1,434 files changed

+28423
-14906
lines changed

Some content is hidden

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

1,434 files changed

+28423
-14906
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"davidanson.vscode-markdownlint",
2323
"bierner.markdown-preview-github-styles",
2424
"streetsidesoftware.code-spell-checker",
25-
"hubwriter.open-reusable"
25+
"alistairchristie.open-reusables"
2626
],
2727

2828
// Use 'forwardPorts' to make a list of ports inside the container available locally.

.github/CODEOWNERS

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,11 @@ package.json @github/docs-engineering
2424
/translations/log/ @github/docs-localization @Octomerger
2525

2626
# Site Policy
27-
/content/github/site-policy/ @github/site-policy-admins
27+
/content/site-policy/ @github/site-policy-admins
2828

2929
# Content strategy
3030
/contributing/content-markup-reference.md @github/docs-content-strategy
3131
/contributing/content-style-guide.md @github/docs-content-strategy
3232
/contributing/content-model.md @github/docs-content-strategy
3333
/contributing/content-style-guide.md @github/docs-content-strategy
3434
/contributing/content-templates.md @github/docs-content-strategy
35-
36-
# Make sure that Octokit maintainers get notified about changes
37-
# relevant to the Octokit libraries (https://github.com/octokit)
38-
/content/rest/reference @github/octokit-maintainers

.github/actions-scripts/enterprise-server-issue-templates/release-issue.md

Lines changed: 20 additions & 10 deletions

.github/actions-scripts/projects.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ export function generateUpdateProjectNextItemFieldMutation({
190190
// Strip all non-alphanumeric out of the item ID when creating the mutation ID to avoid a GraphQL parsing error
191191
// (statistically, this should still give us a unique mutation ID)
192192
return `
193-
set_${fieldID.substr(1)}_item_${item.replaceAll(
193+
set_${fieldID.slice(1)}_item_${item.replaceAll(
194194
/[^a-z0-9]/g,
195195
''
196196
)}: updateProjectNextItemField(input: {

.github/workflows/azure-preview-env-deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
# to link a PR to a list of environments later.
5454
url: ${{ env.APP_URL }}
5555
env:
56-
PR_NUMBER: ${{ github.event.number || github.event.inputs.PR_NUMBER }}
56+
PR_NUMBER: ${{ github.event.number || github.event.inputs.PR_NUMBER || github.run_id }}
5757
COMMIT_REF: ${{ github.event.pull_request.head.sha || github.event.inputs.COMMIT_REF }}
5858
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
5959
IS_INTERNAL_BUILD: ${{ github.repository == 'github/docs-internal' }}
@@ -165,7 +165,7 @@ jobs:
165165
rsync -rptovR ./user-code/content/./**/*.md ./content
166166
rsync -rptovR ./user-code/assets/./**/*.png ./assets
167167
rsync -rptovR ./user-code/data/./**/*.{yml,md} ./data
168-
rsync -rptovR ./user-code/components/./**/*.{ts,tsx} ./components
168+
rsync -rptovR ./user-code/components/./**/*.{scss,ts,tsx} ./components
169169
rsync -rptovR --ignore-missing-args ./user-code/lib/./**/*.{js,ts} ./lib
170170
rsync -rptovR --ignore-missing-args ./user-code/middleware/./**/*.{js,ts} ./middleware
171171
rsync -rptovR ./user-code/pages/./**/*.tsx ./pages

.github/workflows/browser-test.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,8 @@ jobs:
5959
path: .next/cache
6060
key: ${{ runner.os }}-nextjs-${{ hashFiles('package*.json') }}
6161

62+
- name: Run build script
63+
run: npm run build
64+
6265
- name: Run browser-test
6366
run: npm run browser-test

.github/workflows/crowdin-cleanup.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
run: script/i18n/homogenize-frontmatter.js
4242

4343
- name: Check in homogenized files
44-
uses: EndBug/add-and-commit@756d9ea820f11931e591eaf57f25e0f5b903d5b2
44+
uses: EndBug/add-and-commit@050a66787244b10a4874a2a5f682130263edc192
4545
with:
4646
# The arguments for the `git add` command
4747
add: 'translations'

.github/workflows/openapi-decorate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
run: script/rest/update-files.js --decorate-only
5555

5656
- name: Check in the decorated files
57-
uses: EndBug/add-and-commit@756d9ea820f11931e591eaf57f25e0f5b903d5b2
57+
uses: EndBug/add-and-commit@050a66787244b10a4874a2a5f682130263edc192
5858
with:
5959
# The arguments for the `git add` command
6060
add: '["lib/rest/static/apps", "lib/rest/static/decorated"]'

.github/workflows/optimize-images.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ jobs:
2323
uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
2424
with:
2525
ref: ${{ github.head_ref }}
26+
# Need to specify a PAT here because otherwise GITHUB_TOKEN is used
27+
# by default. Workflows won't trigger in that case because actions
28+
# performed with GITHUB_TOKEN don't trigger other workflows.
29+
token: ${{ secrets.DOCUBOT_REPO_PAT }}
2630

2731
- name: Check out base ref
2832
run: git fetch --no-tags --depth=1 origin $GITHUB_BASE_REF

.github/workflows/test.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,6 @@ jobs:
135135
- name: Run build script
136136
run: npm run build
137137

138-
- name: Warm possible disk caching
139-
env:
140-
NODE_ENV: test
141-
run: ./script/warm-before-tests.mjs
142-
143138
- name: Run tests
144139
env:
145140
DIFF_FILE: get_diff_files.txt

0 commit comments

Comments
 (0)