Skip to content

Commit b308a42

Browse files
authored
Merge branch 'main' into patch-4
2 parents 2682eeb + d5ffd37 commit b308a42

File tree

6,691 files changed

+1160532
-552520
lines changed

Some content is hidden

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

6,691 files changed

+1160532
-552520
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@ This file should be automatically updated, but you can also run `script/update-e
116116
Use admin permissions to ship the release branch with this failure. Make sure that the merge's commit title does not include anything like `[DO NOT MERGE]`, and remove all the branch's commit details from the merge's commit message except for the co-author list.
117117
- [ ] Do any required smoke tests listed in the opening post in the megabranch PR.
118118
- [ ] Once smoke tests have passed, you can [unfreeze the repos](https://github.com/github/docs-content/blob/main/docs-content-docs/docs-content-workflows/freezing.md) and post an announcement in Slack.
119-
- [ ] After unfreezing, push the search index LFS objects for the public `github/docs` repo. The LFS objects were already being pushed for the internal repo after the `sync-english-index-for-<PLAN@RELEASE>` was added to the megabranch. To push the LFS objects, run the [search sync workflow](https://github.com/github/docs-internal/actions/workflows/sync-search-indices.yml) with the following inputs:
119+
- [ ] After unfreezing, push the search index LFS objects for the public `github/docs` repo. The LFS objects were already being pushed for the internal repo after the `sync-english-index-for-<PLAN@RELEASE>` was added to the megabranch. To push the LFS objects, run the [search sync workflow](https://github.com/github/docs-internal/actions/workflows/sync-search-indices.yml). Once you're there, click on `Run workflow` button. A modal will pop up where you can set the following inputs:
120+
Branch: The new version megabranch you're working on
120121
version: `enterprise-server@<RELEASE>`
121122
language: `en`
122123
- [ ] After unfreezing, if there were significant or highlighted GraphQL changes in the release, consider manually running the [GraphQL update workflow](https://github.com/github/docs-internal/actions/workflows/update-graphql-files.yml) to update our GraphQL schemas. By default this workflow only runs once every 24 hours.

.github/actions-scripts/openapi-schema-branch.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ const changedFiles = execSync('git diff --name-only HEAD').toString()
3636
if (changedFiles !== '') {
3737
console.log(`These files were changed:\n${changedFiles}`)
3838
console.log(
39-
`🚧⚠️ Your decorated and dereferenced schema files don't match. Ensure you're using decorated and dereferenced schemas from the automatically created pull requests by the 'github-openapi-bot' user. \n\n If this test is failing after updates to the script/rest directory, run script/rest/update-files.js --decorate-only to re-generate the decorated files from the existing dereferenced files and check those in. \n\n If this test is failing after an update to a package, check the changes the new package makes to the decorated files by running script/rest/update-files.js --decorate-only. If the changes are small style changes that don't impact the overall experience, check the updated decorated file in. Otherwise, more work may be needed to be compatible with the updated package. \n\n For more information, see 'script/rest/README.md'. 🛑`
39+
`🚧⚠️ Your decorated and dereferenced schema files don't match. Ensure you're using decorated and dereferenced schemas from the automatically created pull requests by the 'github-openapi-bot' user. \n\n If this test is failing after updates to the script/rest directory, run script/rest/update-files.js --decorate-only to re-generate the decorated files from the existing dereferenced files and check those in. \n\n If this test is failing after an update to a package, check the changes the new package makes to the decorated files by running script/rest/update-files.js --decorate-only.\n\nIf you updated script/rest/utils/rest-api-overrides.json, you'll need to run script/rest/update-files.js --decorate-only to regenerate the decorated file and redirects file (check in the changed lib/rest/static/decorated files).\n\nIf the changes are small style changes that don't impact the overall experience, check the updated decorated file in. Otherwise, more work may be needed to be compatible with the updated package. \n\n For more information, see 'script/rest/README.md'. 🛑`
4040
)
4141
process.exit(1)
4242
}

.github/dependabot.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ updates:
33
- package-ecosystem: npm
44
directory: '/'
55
schedule:
6-
interval: monthly
6+
interval: weekly
7+
day: tuesday
78
open-pull-requests-limit: 20 # default is 5
89
ignore:
910
- dependency-name: '*'
@@ -13,7 +14,8 @@ updates:
1314
- package-ecosystem: 'github-actions'
1415
directory: '/'
1516
schedule:
16-
interval: monthly
17+
interval: weekly
18+
day: wednesday
1719
ignore:
1820
- dependency-name: '*'
1921
update-types:
@@ -22,7 +24,8 @@ updates:
2224
- package-ecosystem: 'docker'
2325
directory: '/'
2426
schedule:
25-
interval: monthly
27+
interval: weekly
28+
day: thursday
2629
ignore:
2730
- dependency-name: '*'
2831
update-types:

.github/workflows/60-days-stale-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
if: github.repository == 'github/docs-internal' || github.repository == 'github/docs'
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/stale@7fb802b3079a276cf3c7e6ba9aa003c665b3f838
20+
- uses: actions/stale@3cc123766321e9f15a6676375c154ccffb12a358
2121
with:
2222
repo-token: ${{ secrets.GITHUB_TOKEN }}
2323
stale-issue-message: 'This issue is stale because it has been open 60 days with no activity.'

.github/workflows/autoupdate-branch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
- name: Setup Node
4646
uses: actions/setup-node@1f8c6b94b26d0feae1e387ca63ccbdc44d27b561
4747
with:
48-
node-version: 16.13.x
48+
node-version: 16.14.x
4949
cache: npm
5050

5151
- name: Install dependencies

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ permissions:
3434

3535
# This allows one deploy workflow to interrupt another
3636
concurrency:
37-
group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label }}'
37+
group: 'preview-env @ ${{ github.head_ref || github.run_id }} for ${{ github.event.number || github.event.inputs.PR_NUMBER }}'
3838
cancel-in-progress: true
3939

4040
jobs:

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ on:
1919
permissions:
2020
contents: read
2121

22+
# This allows one deploy workflow to interrupt another
23+
concurrency:
24+
group: 'preview-env @ ${{ github.head_ref || github.run_id }} for ${{ github.event.number || github.event.inputs.PR_NUMBER }}'
25+
cancel-in-progress: true
26+
2227
jobs:
2328
destory-azure-preview-env:
2429
name: Destroy

.github/workflows/browser-test.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- name: Setup Node
4343
uses: actions/setup-node@1f8c6b94b26d0feae1e387ca63ccbdc44d27b561
4444
with:
45-
node-version: 16.13.x
45+
node-version: 16.14.x
4646
cache: npm
4747

4848
- name: Install dependencies
@@ -59,11 +59,5 @@ jobs:
5959
path: .next/cache
6060
key: ${{ runner.os }}-nextjs-${{ hashFiles('package*.json') }}
6161

62-
- name: Cache lib/redirects/.redirects-cache_en_ja.json
63-
uses: actions/cache@937d24475381cd9c75ae6db12cb4e79714b926ed
64-
with:
65-
path: lib/redirects/.redirects-cache_en_ja.json
66-
key: ${{ runner.os }}-redirects-cache-${{ hashFiles('.github/workflows/browser-test.yml') }}
67-
6862
- name: Run browser-test
6963
run: npm run browser-test

.github/workflows/check-all-english-links.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Setup Node
3131
uses: actions/setup-node@1f8c6b94b26d0feae1e387ca63ccbdc44d27b561
3232
with:
33-
node-version: 16.13.x
33+
node-version: 16.14.x
3434
cache: npm
3535
- name: npm ci
3636
run: npm ci

.github/workflows/check-broken-links-github-github.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- name: Setup Node
4545
uses: actions/setup-node@1f8c6b94b26d0feae1e387ca63ccbdc44d27b561
4646
with:
47-
node-version: 16.13.x
47+
node-version: 16.14.x
4848
cache: npm
4949

5050
- name: Install Node.js dependencies

0 commit comments

Comments
 (0)