Skip to content

Commit 0911820

Browse files
build: configure the ng-dev caretaker check command (#21611)
Create the configuration for the caretaker check command in the repo.
1 parent 4ecdcb5 commit 0911820

File tree

3 files changed

+19
-8
lines changed

3 files changed

+19
-8
lines changed

.github/angular-robot.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ merge:
3030
disabled: true
3131

3232
# comment that will be added to a PR when there is a conflict, leave empty or set to false to disable
33-
mergeConflictComment: "Hi @{{PRAuthor}}! This PR has merge conflicts due to recent upstream merges.
34-
\nPlease help to unblock it by resolving these conflicts. Thanks!"
33+
mergeConflictComment: "Hi @{{PRAuthor}}! This PR has merge conflicts due to recent upstream merges.\nPlease help to unblock it by resolving these conflicts. Thanks!"
3534

3635
# label to monitor
3736
mergeLabel: "pr: merge ready"
@@ -67,12 +66,7 @@ merge:
6766
# the comment that will be added when the merge label is added despite failing checks, leave empty or set to false to disable
6867
# {{MERGE_LABEL}} will be replaced by the value of the mergeLabel option
6968
# {{PLACEHOLDER}} will be replaced by the list of failing checks
70-
mergeRemovedComment: "I see that you just added the `{{MERGE_LABEL}}` label, but the following checks are still failing:
71-
\n{{PLACEHOLDER}}
72-
\n
73-
\n**If you want your PR to be merged, it has to pass all the CI checks.**
74-
\n
75-
\nIf you can't get the PR to a green state due to flakes or broken master, please try rebasing to master and/or restarting the CI job. If that fails and you believe that the issue is not due to your change, please contact the caretaker and ask for help."
69+
mergeRemovedComment: "I see that you just added the `{{MERGE_LABEL}}` label, but the following checks are still failing:\n{{PLACEHOLDER}}\n\n**If you want your PR to be merged, it has to pass all the CI checks.**\n\nIf you can't get the PR to a green state due to flakes or broken master, please try rebasing to master and/or restarting the CI job. If that fails and you believe that the issue is not due to your change, please contact the caretaker and ask for help."
7670

7771
# options for the triage plugin
7872
triage:

.ng-dev/caretaker.ts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import {CaretakerConfig} from '@angular/dev-infra-private/caretaker/config';
2+
3+
/** The configuration for `ng-dev caretaker` commands. */
4+
export const caretaker: CaretakerConfig = {
5+
githubQueries: [
6+
{
7+
name: 'Merge Queue',
8+
query: `is:pr is:open status:success label:"pr: merge ready"`,
9+
},
10+
{
11+
name: 'Triage Queue',
12+
query: `is:open label:"needs triage"`,
13+
}
14+
]
15+
};

.ng-dev/config.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ import {format} from './format';
22
import {github} from './github';
33
import {merge} from './merge';
44
import {commitMessage} from './commit-message';
5+
import {caretaker} from './caretaker';
56

67
module.exports = {
78
commitMessage,
89
format,
910
github,
1011
merge,
12+
caretaker,
1113
};

0 commit comments

Comments
 (0)