Skip to content

Commit 13623fa

Browse files
authored
Merge branch 'main' into mc-dependabot-advisory-db
2 parents 6956246 + 8a750db commit 13623fa

102 files changed

Lines changed: 27389 additions & 12783 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/allowed-actions.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ module.exports = [
99
'actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9', //actions/script@v3.0.0
1010
'actions/labeler@5f867a63be70efff62b767459b009290364495eb', //actions/labeler@v2.2.0
1111
'actions/setup-node@c46424eee26de4078d34105d3de3cc4992202b1e', //actions/setup-node@v2.1.4
12-
'actions/setup-ruby@5f29a1cd8dfebf420691c4c9a0e832e2fae5a526', //actions/setup-ruby@v1.1.2
13-
'actions/stale@af4072615903a8b031f986d25b1ae3bf45ec44d4', //actions/stale@v3.0.13
12+
'ruby/setup-ruby@fdcfbcf14ec9672f6f615cb9589a1bc5dd69d262', //ruby/setup-ruby@vv1.64.1
13+
'actions/stale@9d6f46564a515a9ea11e7762ab3957ee58ca50da', //actions/stale@v3.0.16
1414
'crowdin/github-action@fd9429dd63d6c0f8a8cb4b93ad8076990bd6e688',
1515
'crykn/copy_folder_to_another_repo_action@0282e8b9fef06de92ddcae9fe6cb44df6226646c',
1616
'cschleiden/actions-linter@0ff16d6ac5103cca6c92e6cbc922b646baaea5be',
@@ -24,7 +24,7 @@ module.exports = [
2424
'juliangruber/find-pull-request-action@2fc55e82a6d5d36fe1e7f1848f7e64fd02d99de9',
2525
'juliangruber/read-file-action@e0a316da496006ffd19142f0fd594a1783f3b512',
2626
'lee-dohm/close-matching-issues@22002609b2555fe18f52b8e2e7c07cbf5529e8a8',
27-
'pascalgn/automerge-action@c9bd182',
27+
'pascalgn/automerge-action@c9bd1823770819dc8fb8a5db2d11a3a95fbe9b07', //pascalgn/automerge@0.12.0
2828
'peter-evans/create-issue-from-file@a04ce672e3acedb1f8e416b46716ddfd09905326',
2929
'peter-evans/create-or-update-comment@5221bf4aa615e5c6e95bb142f9673a9c791be2cd',
3030
'peter-evans/create-pull-request@8c603dbb04b917a9fc2dd991dc54fef54b640b43',

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
if: github.repository == 'github/docs-internal' || github.repository == 'github/docs'
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/stale@af4072615903a8b031f986d25b1ae3bf45ec44d4
11+
- uses: actions/stale@9d6f46564a515a9ea11e7762ab3957ee58ca50da
1212
with:
1313
repo-token: ${{ secrets.GITHUB_TOKEN }}
1414
stale-issue-message: 'This issue is stale because it has been open 60 days with no activity.'

.github/workflows/automerge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
if: (contains(github.event.pull_request.labels.*.name, 'automerge') || contains(github.event.pull_request.labels.*.name, 'autosquash')) && (github.repository == 'github/docs-internal' || github.repository == 'github/docs')
2424
steps:
2525
- name: automerge
26-
uses: 'pascalgn/automerge-action@c9bd182'
26+
uses: 'pascalgn/automerge-action@c9bd1823770819dc8fb8a5db2d11a3a95fbe9b07'
2727
env:
2828
GITHUB_TOKEN: '${{ secrets.OCTOMERGER_PAT_WITH_REPO_AND_WORKFLOW_SCOPE }}'
2929
MERGE_METHOD_LABELS: 'automerge=merge,autosquash=squash'

.github/workflows/repo-freeze-check.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
name: Repo Freeze Check
22

33
on:
4-
pull_request:
4+
workflow_dispatch:
5+
pull_request_target:
56
types:
67
- opened
78
- reopened

.github/workflows/repo-sync-stalls.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
})
6161
- name: Send Slack notification if workflow fails
6262
uses: someimportantcompany/github-actions-slack-message@0b470c14b39da4260ed9e3f9a4f1298a74ccdefd
63-
if: failure()
63+
if: ${{ failure() && env.FREEZE != 'true' }}
6464
with:
6565
channel: ${{ secrets.DOCS_ALERTS_SLACK_CHANNEL_ID }}
6666
bot-token: ${{ secrets.SLACK_DOCS_BOT_TOKEN }}

.github/workflows/triage-stale-check.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010

1111
steps:
12-
- uses: actions/stale@af4072615903a8b031f986d25b1ae3bf45ec44d4
12+
- uses: actions/stale@9d6f46564a515a9ea11e7762ab3957ee58ca50da
1313
with:
1414
repo-token: ${{ secrets.GITHUB_TOKEN }}
1515
stale-pr-message: 'A stale label has been added to this pull request because it has been open 7 days with no activity. To keep this PR open, add a comment or push a commit within 3 days.'
@@ -21,12 +21,13 @@ jobs:
2121
if: github.repository == 'github/docs'
2222
runs-on: ubuntu-latest
2323
steps:
24-
- uses: actions/stale@af4072615903a8b031f986d25b1ae3bf45ec44d4
24+
- uses: actions/stale@9d6f46564a515a9ea11e7762ab3957ee58ca50da
2525
with:
2626
repo-token: ${{ secrets.GITHUB_TOKEN }}
2727
stale-pr-message: 'This is a gentle bump for the docs team that this PR is waiting for review.'
2828
days-before-pr-stale: 14
2929
days-before-pr-close: -1 # Never close
30+
remove-stale-when-updated: false
3031
only-labels: 'waiting for review'
3132
# The hope is that by setting the stale-pr-label to the same label
3233
# as the label that the stale check looks for, this will result in

.github/workflows/update-graphql-files.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Checkout
2727
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
2828
- name: Set up Ruby
29-
uses: actions/setup-ruby@5f29a1cd8dfebf420691c4c9a0e832e2fae5a526
29+
uses: ruby/setup-ruby@fdcfbcf14ec9672f6f615cb9589a1bc5dd69d262
3030
with:
3131
ruby-version: '2.4'
3232
- name: Install Ruby dependencies
@@ -54,7 +54,7 @@ jobs:
5454
syncs up the GraphQL data in this repo.\n\n
5555
If CI passes, this PR will be auto-merged. :green_heart:\n\n
5656
If CI does not pass or other problems arise, contact #docs-engineering on slack."
57-
labels: automerge
57+
labels: automerge,autoupdate
5858
branch: graphql-schema-update
5959
- if: ${{ failure() }}
6060
name: Delete remote branch (if previous steps failed)
@@ -66,5 +66,13 @@ jobs:
6666
name: Approve
6767
uses: juliangruber/approve-pull-request-action@c530832d4d346c597332e20e03605aa94fa150a8
6868
with:
69-
github-token: ${{ secrets.GITHUB_TOKEN }}
69+
github-token: ${{ secrets.DOCUBOT_REPO_PAT }}
7070
number: ${{ steps.create-pull-request.outputs.pull-request-number }}
71+
- name: Send Slack notification if workflow fails
72+
uses: someimportantcompany/github-actions-slack-message@0b470c14b39da4260ed9e3f9a4f1298a74ccdefd
73+
if: failure()
74+
with:
75+
channel: ${{ secrets.DOCS_ALERTS_SLACK_CHANNEL_ID }}
76+
bot-token: ${{ secrets.SLACK_DOCS_BOT_TOKEN }}
77+
color: failure
78+
text: The last update-graphql-files run for ${{github.repository}} failed. See https://github.com/github/${{github.repository}}/actions/workflows/update-graphql-files.yml
20.8 KB
Loading
49.6 KB
Loading
81.5 KB
Loading

0 commit comments

Comments
 (0)