Skip to content

Commit

Permalink
ci: update remaining references to old pr targeting system
Browse files Browse the repository at this point in the history
Completes the migration to use the new unified target label system, updating
dependabot, renovate and angular-robot to expect the new labels.
  • Loading branch information
josephperrott authored and filipesilva committed Dec 11, 2020
1 parent 205ea2b commit c6e7da1
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 13 deletions.
11 changes: 5 additions & 6 deletions .github/angular-robot.yml
Expand Up @@ -18,24 +18,23 @@ merge:
\nPlease help to unblock it by resolving these conflicts. Thanks!"

# label to monitor
mergeLabel: "PR action: merge"
mergeLabel: "action: merge"

# list of checks that will determine if the merge label can be added
checks:
# whether the PR shouldn't have a conflict with the base branch
noConflict: true
# whether the PR should have all reviews completed.
requireReviews: true
# 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")
# list of labels that a PR needs to have, checked with a regexp (e.g. "target:" will work for the label "target: major")
requiredLabels:
- "PR target: *"
- "target: *"
- "cla: yes"

# list of labels that a PR shouldn't have, checked after the required labels with a regexp
forbiddenLabels:
- "PR target: TBD"
- "PR action: cleanup"
- "PR action: review"
- "action: cleanup"
- "action: review"
- "PR state: blocked"
- "cla: no"

Expand Down
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Expand Up @@ -9,8 +9,8 @@ updates:
prefix: "build"
labels:
- "comp: build & ci"
- "PR target: master & patch"
- "PR action: merge"
- "target: patch"
- "action: merge"
# Disable version updates
# This does not affect security updates
open-pull-requests-limit: 0
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Expand Up @@ -117,7 +117,7 @@ Before you submit your Pull Request (PR) consider the following guidelines:
git rebase master -i
git push -f
```
* Add the `PR action: merge` label and the correct
* Add the `action: merge` label and the correct
[target label](https://github.com/angular/angular/blob/master/docs/TRIAGE_AND_LABELS.md#pr-target)
(if PR author has the project collaborator status, or else the last reviewer
should do this).
Expand Down
2 changes: 1 addition & 1 deletion docs/process/release.md
Expand Up @@ -30,7 +30,7 @@ TBD
The list of PRs which are currently ready to merge (approved with passing status checks) can
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).
This list should be checked daily and any ready PRs should be merged. For each PR, check the
`PR target` label to understand where it should be merged to. You can find which branches a specific
`target` label to understand where it should be merged to. You can find which branches a specific
PR will be merged into with the `yarn ng-dev pr check-target-branches <pr>` command.

When ready to merge a PR, run the following command:
Expand Down
4 changes: 2 additions & 2 deletions renovate.json
Expand Up @@ -6,8 +6,8 @@
"separateMajorMinor": false,
"prHourlyLimit": 2,
"labels": [
"PR target: master-only",
"PR action: merge"
"target: minor",
"action: merge"
],
"timezone": "America/Tijuana",
"lockFileMaintenance": {
Expand Down
2 changes: 1 addition & 1 deletion scripts/templates/contributing.ejs
Expand Up @@ -117,7 +117,7 @@ Before you submit your Pull Request (PR) consider the following guidelines:
git rebase master -i
git push -f
```
* Add the `PR action: merge` label and the correct
* Add the `action: merge` label and the correct
[target label](https://github.com/angular/angular/blob/master/docs/TRIAGE_AND_LABELS.md#pr-target)
(if PR author has the project collaborator status, or else the last reviewer
should do this).
Expand Down

0 comments on commit c6e7da1

Please sign in to comment.