Skip to content

Commit

Permalink
build: add configuration for the caretaker command (angular#38601)
Browse files Browse the repository at this point in the history
Add configuration information for the new caretaker command

PR Close angular#38601
  • Loading branch information
josephperrott committed Sep 1, 2020
1 parent a6f3cd9 commit 59c234c
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 8 deletions.
10 changes: 2 additions & 8 deletions .github/angular-robot.yml
Expand Up @@ -73,8 +73,7 @@ merge:
- "packages/zone.js/scripts/**"

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

# label to monitor
mergeLabel: "action: merge"
Expand Down Expand Up @@ -121,12 +120,7 @@ merge:
# the comment that will be added when the merge label is added despite failing checks, leave empty or set to false to disable
# {{MERGE_LABEL}} will be replaced by the value of the mergeLabel option
# {{PLACEHOLDER}} will be replaced by the list of failing checks
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."
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."

# options for the triage plugin
triage:
Expand Down
19 changes: 19 additions & 0 deletions .ng-dev/caretaker.ts
@@ -0,0 +1,19 @@
import {CaretakerConfig} from '../dev-infra/caretaker/config';

/** The configuration for `ng-dev caretaker` commands. */
export const caretaker: CaretakerConfig = {
githubQueries: [
{
name: 'Merge Queue',
query: `is:pr is:open status:success label:"action: merge"`,
},
{
name: 'Merge Assistance Queue',
query: `is:pr is:open status:success label:"action: merge-assistance"`,
},
{
name: 'Primary Triage Queue',
query: `is:open is:issue no:milestone`,
}
]
};
2 changes: 2 additions & 0 deletions .ng-dev/config.ts
@@ -1,3 +1,4 @@
import {caretaker} from './caretaker';
import {commitMessage} from './commit-message';
import {format} from './format';
import {github} from './github';
Expand All @@ -8,4 +9,5 @@ module.exports = {
format,
github,
merge,
caretaker,
};

0 comments on commit 59c234c

Please sign in to comment.