Skip to content

build: configure the ng-dev caretaker check command #21611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions .github/angular-robot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ merge:
disabled: true

# 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: "pr: merge ready"
Expand Down Expand Up @@ -67,12 +66,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
15 changes: 15 additions & 0 deletions .ng-dev/caretaker.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import {CaretakerConfig} from '@angular/dev-infra-private/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:"pr: merge ready"`,
},
{
name: 'Triage Queue',
query: `is:open label:"needs triage"`,
}
]
};
2 changes: 2 additions & 0 deletions .ng-dev/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ import {format} from './format';
import {github} from './github';
import {merge} from './merge';
import {commitMessage} from './commit-message';
import {caretaker} from './caretaker';

module.exports = {
commitMessage,
format,
github,
merge,
caretaker,
};