Skip to content

Commit 6e1b390

Browse files
josephperrottfilipesilva
authored andcommitted
ci: update remaining references to old pr targeting system
Completes the migration to use the new unified target label system, updating dependabot, renovate and angular-robot to expect the new labels.
1 parent 8492287 commit 6e1b390

File tree

6 files changed

+12
-13
lines changed

6 files changed

+12
-13
lines changed

.github/angular-robot.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,23 @@ merge:
1818
\nPlease help to unblock it by resolving these conflicts. Thanks!"
1919

2020
# label to monitor
21-
mergeLabel: "PR action: merge"
21+
mergeLabel: "action: merge"
2222

2323
# list of checks that will determine if the merge label can be added
2424
checks:
2525
# whether the PR shouldn't have a conflict with the base branch
2626
noConflict: true
2727
# whether the PR should have all reviews completed.
2828
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")
3030
requiredLabels:
31-
- "PR target: *"
31+
- "target: *"
3232
- "cla: yes"
3333

3434
# list of labels that a PR shouldn't have, checked after the required labels with a regexp
3535
forbiddenLabels:
36-
- "PR target: TBD"
37-
- "PR action: cleanup"
38-
- "PR action: review"
36+
- "action: cleanup"
37+
- "action: review"
3938
- "PR state: blocked"
4039
- "cla: no"
4140

.github/dependabot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ updates:
99
prefix: "build"
1010
labels:
1111
- "comp: build & ci"
12-
- "PR target: master & patch"
13-
- "PR action: merge"
12+
- "target: patch"
13+
- "action: merge"
1414
# Disable version updates
1515
# This does not affect security updates
1616
open-pull-requests-limit: 0

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ Before you submit your Pull Request (PR) consider the following guidelines:
117117
git rebase master -i
118118
git push -f
119119
```
120-
* Add the `PR action: merge` label and the correct
120+
* Add the `action: merge` label and the correct
121121
[target label](https://github.com/angular/angular/blob/master/docs/TRIAGE_AND_LABELS.md#pr-target)
122122
(if PR author has the project collaborator status, or else the last reviewer
123123
should do this).

docs/process/release.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ TBD
3030
The list of PRs which are currently ready to merge (approved with passing status checks) can
3131
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).
3232
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
3434
PR will be merged into with the `yarn ng-dev pr check-target-branches <pr>` command.
3535

3636
When ready to merge a PR, run the following command:

renovate.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"separateMajorMinor": false,
77
"prHourlyLimit": 2,
88
"labels": [
9-
"PR target: master-only",
10-
"PR action: merge"
9+
"target: minor",
10+
"action: merge"
1111
],
1212
"timezone": "America/Tijuana",
1313
"lockFileMaintenance": {

scripts/templates/contributing.ejs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ Before you submit your Pull Request (PR) consider the following guidelines:
117117
git rebase master -i
118118
git push -f
119119
```
120-
* Add the `PR action: merge` label and the correct
120+
* Add the `action: merge` label and the correct
121121
[target label](https://github.com/angular/angular/blob/master/docs/TRIAGE_AND_LABELS.md#pr-target)
122122
(if PR author has the project collaborator status, or else the last reviewer
123123
should do this).

0 commit comments

Comments
 (0)