Skip to content

Commit 5d0d6b7

Browse files
committed
merge from main
2 parents 3379c99 + f1a8e0e commit 5d0d6b7

1,724 files changed

Lines changed: 11674 additions & 19959 deletions

File tree

Some content is hidden

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

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ See our [CONTRIBUTING.md](/main/CONTRIBUTING.md) for information how to contribu
55
66
For changes to content in [site policy](https://github.com/github/docs/tree/main/content/github/site-policy), see the [CONTRIBUTING guide in the site-policy repo](https://github.com/github/site-policy/blob/main/CONTRIBUTING.md).
77
8-
We cannot accept changes to our translated content right now. See the [contributing.md](/main/CONTRIBUTING.md#earth_asia-translations) for more information.
8+
We cannot accept changes to our translated content right now. See the [types-of-contributions.md](/main/contributing/types-of-contributions.md#earth_asia-translations) for more information.
99
1010
Thanks again!
1111
-->

.github/actions-scripts/projects.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,13 @@ export function generateUpdateProjectNextItemFieldMutation({
164164
function generateMutationToUpdateField({ item, fieldID, value, literal = false }) {
165165
const parsedValue = literal ? `value: "${value}"` : `value: ${value}`
166166

167-
// Strip "=" out of the item ID when creating the mutation ID to avoid a GraphQL parsing error
167+
// Strip all non-alphanumeric out of the item ID when creating the mutation ID to avoid a GraphQL parsing error
168168
// (statistically, this should still give us a unique mutation ID)
169169
return `
170-
set_${fieldID.substr(1)}_item_${item.replaceAll('=', '')}: updateProjectNextItemField(input: {
170+
set_${fieldID.substr(1)}_item_${item.replaceAll(
171+
/[^a-z0-9]/g,
172+
''
173+
)}: updateProjectNextItemField(input: {
171174
projectId: $project
172175
itemId: "${item}"
173176
fieldId: ${fieldID}

.github/allowed-actions.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export default [
77
'actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f', // v2.3.4
88
'actions/github-script@2b34a689ec86a68d8ab9478298f91d5401337b7d', // v4.0.2
99
'actions/labeler@5f867a63be70efff62b767459b009290364495eb', // v2.2.0
10-
'actions/setup-node@38d90ce44d5275ad62cc48384b3d8a58c500bb5f', // v2.2.0
10+
'actions/setup-node@270253e841af726300e85d718a5f606959b2903c', // v2.4.1
1111
'actions/stale@cdf15f641adb27a71842045a94023bef6945e3aa', // v4.0.0
1212
'actions/upload-artifact@27121b0bdffd731efa15d66772be8dc71245d074', // v2.2.4
1313
'alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488', // v0.8.1
@@ -29,12 +29,12 @@ export default [
2929
'peter-evans/create-issue-from-file@b4f9ee0a9d4abbfc6986601d9b1a4f8f8e74c77e',
3030
'peter-evans/create-or-update-comment@5221bf4aa615e5c6e95bb142f9673a9c791be2cd',
3131
'peter-evans/create-pull-request@7380612b49221684fefa025244f2ef4008ae50ad', // v3.10.1
32-
'peter-evans/find-comment@0da1f4fc1f20cd898368bd56089d391df418f52f',
32+
'peter-evans/find-comment@d2dae40ed151c634e4189471272b57e76ec19ba8', // v1.3.0
3333
'rachmari/actions-add-new-issue-to-column@1a459ef92308ba7c9c9dc2fcdd72f232495574a9',
3434
'repo-sync/github-sync@3832fe8e2be32372e1b3970bbae8e7079edeec88',
3535
'repo-sync/pull-request@65194d8015be7624d231796ddee1cd52a5023cb3', // v2.6
3636
'someimportantcompany/github-actions-slack-message@0b470c14b39da4260ed9e3f9a4f1298a74ccdefd',
37-
'tjenkinson/gh-action-auto-merge-dependency-updates@4d7756c04d9d999c5968697a621b81c47f533d61',
37+
'tjenkinson/gh-action-auto-merge-dependency-updates@c47f6255e06f36e84201ee940466e731ffa6e885', // v1.1.1
3838
'Bhacaz/checkout-files@c8f01756bfd894ba746d5bf48205e19000b0742b', // v1.0.0
3939
'EndBug/add-and-commit@2bdc0a61a03738a1d1bda24d566ad0dbe3083d87',
4040
]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ jobs:
2424
stale-issue-label: 'stale'
2525
stale-pr-label: 'stale'
2626
exempt-pr-labels: 'never-stale'
27-
exempt-issue-labels: 'never-stale'
27+
exempt-issue-labels: 'never-stale, help wanted, waiting for review'

.github/workflows/automerge-dependencies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
}}
3737
runs-on: ubuntu-latest
3838
steps:
39-
- uses: tjenkinson/gh-action-auto-merge-dependency-updates@4d7756c04d9d999c5968697a621b81c47f533d61
39+
- uses: tjenkinson/gh-action-auto-merge-dependency-updates@c47f6255e06f36e84201ee940466e731ffa6e885
4040
with:
4141
repo-token: ${{ secrets.GITHUB_TOKEN }}
4242
allowed-actors: dependabot[bot]

.github/workflows/browser-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
run: git lfs checkout
2626

2727
- name: Setup Node
28-
uses: actions/setup-node@38d90ce44d5275ad62cc48384b3d8a58c500bb5f
28+
uses: actions/setup-node@270253e841af726300e85d718a5f606959b2903c
2929
with:
3030
node-version: 16.8.x
3131
cache: npm

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Check out repo's default branch
2525
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
2626
- name: Setup Node
27-
uses: actions/setup-node@38d90ce44d5275ad62cc48384b3d8a58c500bb5f
27+
uses: actions/setup-node@270253e841af726300e85d718a5f606959b2903c
2828
with:
2929
node-version: 16.8.x
3030
cache: npm

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
4040

4141
- name: Setup Node
42-
uses: actions/setup-node@38d90ce44d5275ad62cc48384b3d8a58c500bb5f
42+
uses: actions/setup-node@270253e841af726300e85d718a5f606959b2903c
4343
with:
4444
node-version: 16.8.x
4545
cache: npm

.github/workflows/content-changes-table-comment.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
4242

4343
- name: Setup Node
44-
uses: actions/setup-node@38d90ce44d5275ad62cc48384b3d8a58c500bb5f
44+
uses: actions/setup-node@270253e841af726300e85d718a5f606959b2903c
4545
with:
4646
node-version: 16.8.x
4747
cache: npm
@@ -102,7 +102,7 @@ jobs:
102102
core.setOutput('changesTable', markdownTable)
103103
104104
- name: Find content directory changes comment
105-
uses: peter-evans/find-comment@0da1f4fc1f20cd898368bd56089d391df418f52f
105+
uses: peter-evans/find-comment@d2dae40ed151c634e4189471272b57e76ec19ba8
106106
id: findComment
107107
with:
108108
issue-number: ${{ github.event.pull_request.number }}

.github/workflows/crowdin-cleanup.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
2222

2323
- name: Setup Node
24-
uses: actions/setup-node@38d90ce44d5275ad62cc48384b3d8a58c500bb5f
24+
uses: actions/setup-node@270253e841af726300e85d718a5f606959b2903c
2525
with:
2626
node-version: 16.8.x
2727
cache: npm

0 commit comments

Comments
 (0)