File tree Expand file tree Collapse file tree 6 files changed +12
-13
lines changed Expand file tree Collapse file tree 6 files changed +12
-13
lines changed Original file line number Diff line number Diff line change @@ -18,24 +18,23 @@ merge:
18
18
\n Please help to unblock it by resolving these conflicts. Thanks!"
19
19
20
20
# label to monitor
21
- mergeLabel : " PR action: merge"
21
+ mergeLabel : " action: merge"
22
22
23
23
# list of checks that will determine if the merge label can be added
24
24
checks :
25
25
# whether the PR shouldn't have a conflict with the base branch
26
26
noConflict : true
27
27
# whether the PR should have all reviews completed.
28
28
requireReviews : true
29
- # list of labels that a PR needs to have, checked with a regexp (e.g. "PR target:" will work for the label "PR target: master ")
29
+ # list of labels that a PR needs to have, checked with a regexp (e.g. "target:" will work for the label "target: major ")
30
30
requiredLabels :
31
- - " PR target: *"
31
+ - " target: *"
32
32
- " cla: yes"
33
33
34
34
# list of labels that a PR shouldn't have, checked after the required labels with a regexp
35
35
forbiddenLabels :
36
- - " PR target: TBD"
37
- - " PR action: cleanup"
38
- - " PR action: review"
36
+ - " action: cleanup"
37
+ - " action: review"
39
38
- " PR state: blocked"
40
39
- " cla: no"
41
40
Original file line number Diff line number Diff line change 9
9
prefix : " build"
10
10
labels :
11
11
- " comp: build & ci"
12
- - " PR target: master & patch"
13
- - " PR action: merge"
12
+ - " target: patch"
13
+ - " action: merge"
14
14
# Disable version updates
15
15
# This does not affect security updates
16
16
open-pull-requests-limit : 0
Original file line number Diff line number Diff line change @@ -117,7 +117,7 @@ Before you submit your Pull Request (PR) consider the following guidelines:
117
117
git rebase master -i
118
118
git push -f
119
119
` ` `
120
- * Add the ` PR action: merge` label and the correct
120
+ * Add the ` action: merge` label and the correct
121
121
[target label](https://github.com/angular/angular/blob/master/docs/TRIAGE_AND_LABELS.md#pr-target)
122
122
(if PR author has the project collaborator status, or else the last reviewer
123
123
should do this).
Original file line number Diff line number Diff line change 30
30
The list of PRs which are currently ready to merge (approved with passing status checks) can
31
31
be found with [ this search] ( https://github.com/angular/angular-cli/pulls?q=is%3Apr+is%3Aopen+label%3A%22PR+action%3A+merge%22+-is%3Adraft ) .
32
32
This list should be checked daily and any ready PRs should be merged. For each PR, check the
33
- ` PR target` label to understand where it should be merged to. You can find which branches a specific
33
+ ` target ` label to understand where it should be merged to. You can find which branches a specific
34
34
PR will be merged into with the ` yarn ng-dev pr check-target-branches <pr> ` command.
35
35
36
36
When ready to merge a PR, run the following command:
Original file line number Diff line number Diff line change 6
6
"separateMajorMinor" : false ,
7
7
"prHourlyLimit" : 2 ,
8
8
"labels" : [
9
- " PR target: master-only " ,
10
- " PR action: merge"
9
+ " target: minor " ,
10
+ " action: merge"
11
11
],
12
12
"timezone" : " America/Tijuana" ,
13
13
"lockFileMaintenance" : {
Original file line number Diff line number Diff line change @@ -117,7 +117,7 @@ Before you submit your Pull Request (PR) consider the following guidelines:
117
117
git rebase master -i
118
118
git push -f
119
119
```
120
- * Add the `PR action: merge` label and the correct
120
+ * Add the `action: merge` label and the correct
121
121
[target label](https://github.com/angular/angular/blob/master/docs/TRIAGE_AND_LABELS.md#pr-target)
122
122
(if PR author has the project collaborator status, or else the last reviewer
123
123
should do this).
You can’t perform that action at this time.
0 commit comments