Skip to content

Commit 20197bc

Browse files
authored
Merge branch 'master' into next-major
2 parents 855e120 + 933cd08 commit 20197bc

File tree

5 files changed

+14
-7
lines changed

5 files changed

+14
-7
lines changed

.github/workflows/automerge-for-humans-add-ready-to-merge-or-do-not-merge-label.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
repo: pull.head.repo.name,
5151
basehead: `${pull.base.label}...${pull.head.label}`,
5252
});
53-
if (comparison.behind_by !== 0) {
53+
if (comparison.behind_by !== 0 && pull.mergeable_state === 'behind') {
5454
console.log(`This branch is behind the target by ${comparison.behind_by} commits`)
5555
console.log('adding out-of-date comment...');
5656
github.rest.issues.createComment({
@@ -108,4 +108,4 @@ jobs:
108108
owner: context.repo.owner,
109109
repo: context.repo.repo,
110110
labels: ['autoupdate']
111-
})
111+
})

.github/workflows/automerge-orphans.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
name: Send info about orphan to slack
5858
uses: rtCamp/action-slack-notify@v2
5959
env:
60-
SLACK_WEBHOOK: ${{secrets.SLACK_GITHUB_NEWISSUEPR}}
60+
SLACK_WEBHOOK: ${{secrets.SLACK_CI_FAIL_NOTIFY}}
6161
SLACK_TITLE: 🚨 Not merged PR that should be automerged 🚨
6262
SLACK_MESSAGE: ${{steps.issuemarkdown.outputs.text}}
6363
MSG_MINIMAL: true

.github/workflows/link-check-cron.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ jobs:
2929
- name: Report workflow run status to Slack
3030
uses: 8398a7/action-slack@v3
3131
with:
32-
status: ${{ job.status }}
33-
fields: repo,message,action,eventName,ref,workflow
32+
status: ${{ job.status }}
33+
fields: repo,action,workflow
3434
env:
35-
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_DOCS_CHANNEL }}
35+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_CI_FAIL_NOTIFY }}
3636
if: failure() # Only, on failure, send a message on the Slack Docs Channel (if there are broken links)

.github/workflows/link-check-pr.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,15 @@ name: Check Markdown links
66
on:
77
pull_request_target:
88
types: [synchronize, ready_for_review, opened, reopened]
9+
paths:
10+
- '**.md'
911

1012
jobs:
1113
External-link-validation-on-PR:
1214
runs-on: ubuntu-latest
1315
steps:
14-
- uses: actions/checkout@v3
16+
- name: Checkout repo
17+
uses: actions/checkout@v3
1518
- name: Check links
1619
uses: gaurav-nelson/github-action-markdown-link-check@v1
1720
with:

package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@
5656
{
5757
"name": "2022-04-release",
5858
"prerelease": true
59+
},
60+
{
61+
"name": "next-major-spec",
62+
"prerelease": true
5963
}
6064
],
6165
"plugins": [

0 commit comments

Comments
 (0)