Skip to content

Commit 843a848

Browse files
committed
ci: format angular-robot configuration
Previously, running `yarn ng-dev caretaker check` would fail with `Multi-line double-quoted string needs to be sufficiently indented`. (cherry picked from commit 4a45587)
1 parent 6f44b20 commit 843a848

File tree

1 file changed

+15
-8
lines changed

1 file changed

+15
-8
lines changed

.github/angular-robot.yml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ merge:
1414
failureText: "The following checks are failing:"
1515

1616
# comment that will be added to a PR when there is a conflict, leave empty or set to false to disable
17-
mergeConflictComment: "Hi @{{PRAuthor}}! This PR has merge conflicts due to recent upstream merges.
18-
\nPlease help to unblock it by resolving these conflicts. Thanks!"
17+
mergeConflictComment: >-
18+
Hi @{{PRAuthor}}! This PR has merge conflicts due to recent upstream merges.
19+
20+
Please help to unblock it by resolving these conflicts. Thanks!
1921
2022
# label to monitor
2123
mergeLabel: "action: merge"
@@ -56,13 +58,18 @@ merge:
5658
# the comment that will be added when the merge label is added despite failing checks, leave empty or set to false to disable
5759
# {{MERGE_LABEL}} will be replaced by the value of the mergeLabel option
5860
# {{PLACEHOLDER}} will be replaced by the list of failing checks
59-
mergeRemovedComment: "I see that you just added the `{{MERGE_LABEL}}` label, but the following checks are still failing:
60-
\n{{PLACEHOLDER}}
61-
\n
62-
\n**If you want your PR to be merged, it has to pass all the CI checks.**
63-
\n
64-
\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."
61+
mergeRemovedComment: >-
62+
I see that you just added the `{{MERGE_LABEL}}` label, but the following
63+
checks are still failing:
6564
65+
{{PLACEHOLDER}}
66+
67+
**If you want your PR to be merged, it has to pass all the CI checks.**
68+
69+
If you can't get the PR to a green state due to flakes or broken master,
70+
please try rebasing to master and/or restarting the CI job. If that fails
71+
and you believe that the issue is not due to your change, please contact the
72+
caretaker and ask for help.
6673
# options for the triage plugin
6774
triage:
6875
# set to true to disable

0 commit comments

Comments
 (0)