Skip to content

Commit 519e9e1

Browse files
gkalpakAndrewKushnir
gkalpak
authored and
AndrewKushnir
committed
ci: minor PullApprove fixes/improvements (angular#35015)
This is a follow-up to angular#34814 to fix some typos in patterns and make them more similar to the old patterns from `.github/CODEOWNERS`. PR Close angular#35015
1 parent 4a5467b commit 519e9e1

3 files changed

Lines changed: 56 additions & 58 deletions

File tree

‎.pullapprove.yml‎

Lines changed: 51 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
####################################################################################
66
#
77
# Configuration of code ownership and review approvals for the angular/angular repo.
8+
#
9+
# More info: https://docs.pullapprove.com/
10+
#
811
# =========================================================
912
# General rules / philosophy
1013
# =========================================================
@@ -73,6 +76,8 @@
7376
# =========================================================
7477
# @angular/framework-global-approvers
7578
# =========================================================
79+
# Used for approving minor changes, large-scale refactorings, and in emergency situations.
80+
#
7681
# IgorMinar
7782
# josephperrott
7883
# kara
@@ -81,9 +86,11 @@
8186
# =========================================================
8287
# @angular/framework-global-approvers-for-docs-only-changes
8388
# =========================================================
89+
# Used for approving minor documentation-only changes that don't require engineering review.
90+
#
8491
# aikidave
85-
# kapunahelewong
8692
# gkalpak
93+
# kapunahelewong
8794
# petebacondarwin
8895

8996

@@ -162,7 +169,7 @@ groups:
162169
conditions:
163170
- >
164171
contains_any_globs(files, [
165-
'packages/compiler-cli/ngcc/*'
172+
'packages/compiler-cli/ngcc/**'
166173
])
167174
reviewers:
168175
users:
@@ -175,23 +182,6 @@ groups:
175182
- ~framework-global-approvers-for-docs-only-changes
176183

177184

178-
# =========================================================
179-
# Framework: Compiler + CLI integration
180-
# =========================================================
181-
fw-cli-integration:
182-
conditions:
183-
- >
184-
contains_any_globs(files, [
185-
'packages/compiler-cli/src/ngtools/**',
186-
])
187-
reviewers:
188-
users:
189-
- filipesilva
190-
teams:
191-
- ~framework-global-approvers
192-
- ~framework-global-approvers-for-docs-only-changes
193-
194-
195185
# =========================================================
196186
# Framework: Core
197187
# =========================================================
@@ -298,7 +288,7 @@ groups:
298288
'aio/content/images/guide/structural-directives/**',
299289
'aio/content/guide/user-input.md',
300290
'aio/content/examples/user-input/**',
301-
'aio/content/images/guide/user-input/*'
291+
'aio/content/images/guide/user-input/**'
302292
])
303293
reviewers:
304294
users:
@@ -324,7 +314,7 @@ groups:
324314
'packages/examples/http/**',
325315
'aio/content/guide/http.md',
326316
'aio/content/examples/http/**',
327-
'aio/content/images/guide/http/*'
317+
'aio/content/images/guide/http/**'
328318
])
329319
reviewers:
330320
users:
@@ -379,7 +369,7 @@ groups:
379369
'aio/content/images/guide/dynamic-form/**',
380370
'aio/content/guide/reactive-forms.md',
381371
'aio/content/examples/reactive-forms/**',
382-
'aio/content/images/guide/reactive-forms/*'
372+
'aio/content/images/guide/reactive-forms/**'
383373
])
384374
reviewers:
385375
users:
@@ -411,7 +401,7 @@ groups:
411401
'packages/compiler-cli/src/extract_i18n.ts',
412402
'packages/localize/**',
413403
'aio/content/guide/i18n.md',
414-
'aio/content/examples/i18n/*'
404+
'aio/content/examples/i18n/**'
415405
])
416406
reviewers:
417407
users:
@@ -432,7 +422,7 @@ groups:
432422
contains_any_globs(files, [
433423
'packages/platform-server/**',
434424
'aio/content/guide/universal.md',
435-
'aio/content/examples/universal/*'
425+
'aio/content/examples/universal/**'
436426
])
437427
reviewers:
438428
users:
@@ -454,7 +444,7 @@ groups:
454444
'packages/examples/router/**',
455445
'aio/content/guide/router.md',
456446
'aio/content/examples/router/**',
457-
'aio/content/images/guide/router/*'
447+
'aio/content/images/guide/router/**'
458448
])
459449
reviewers:
460450
users:
@@ -480,7 +470,7 @@ groups:
480470
'aio/content/guide/service-worker-config.md',
481471
'aio/content/guide/service-worker-devops.md',
482472
'aio/content/guide/service-worker-intro.md',
483-
'aio/content/images/guide/service-worker/*'
473+
'aio/content/images/guide/service-worker/**'
484474
])
485475
reviewers:
486476
users:
@@ -512,7 +502,7 @@ groups:
512502
'aio/content/guide/upgrade-performance.md',
513503
'aio/content/guide/upgrade-setup.md',
514504
'aio/content/guide/ajs-quick-reference.md',
515-
'aio/content/examples/ajs-quick-reference/*'
505+
'aio/content/examples/ajs-quick-reference/**'
516506
])
517507
reviewers:
518508
users:
@@ -530,15 +520,15 @@ groups:
530520
conditions:
531521
- >
532522
contains_any_globs(files, [
533-
'testing/**',
523+
'**/testing/**',
534524
'aio/content/guide/testing.md',
535525
'aio/content/examples/testing/**',
536-
'aio/content/images/guide/testing/*'
526+
'aio/content/images/guide/testing/**'
537527
])
538528
reviewers:
539529
users:
540-
- kara
541530
- IgorMinar
531+
- kara
542532
- pkozlowski-opensource
543533
teams:
544534
- ~framework-global-approvers
@@ -558,7 +548,7 @@ groups:
558548
'packages/platform-browser/src/security/**',
559549
'aio/content/guide/security.md',
560550
'aio/content/examples/security/**',
561-
'aio/content/images/guide/security/*'
551+
'aio/content/images/guide/security/**'
562552
])
563553
reviewers:
564554
users:
@@ -581,9 +571,9 @@ groups:
581571
])
582572
reviewers:
583573
users:
584-
- kyliau
585574
- IgorMinar
586575
- josephperrott
576+
- kyliau
587577
teams:
588578
- ~framework-global-approvers
589579
- ~framework-global-approvers-for-docs-only-changes
@@ -598,8 +588,8 @@ groups:
598588
contains_any_globs(files, [
599589
'packages/language-service/**',
600590
'aio/content/guide/language-service.md',
601-
'aio/content/images/guide/language-service/*'
602-
])
591+
'aio/content/images/guide/language-service/**'
592+
])
603593
reviewers:
604594
users:
605595
- kyliau
@@ -650,7 +640,7 @@ groups:
650640
conditions:
651641
- >
652642
contains_any_globs(files, [
653-
'integration/*'
643+
'integration/**'
654644
])
655645
reviewers:
656646
users:
@@ -660,7 +650,6 @@ groups:
660650
- mhevery
661651
teams:
662652
- ~framework-global-approvers
663-
- ~framework-global-approvers-for-docs-only-changes
664653

665654

666655
# =========================================================
@@ -684,7 +673,7 @@ groups:
684673
'aio/content/examples/getting-started-v0/**',
685674
'aio/content/examples/getting-started/**',
686675
'aio/content/start/**',
687-
'aio/content/images/guide/start/*'
676+
'aio/content/images/guide/start/**'
688677
])
689678
reviewers:
690679
users:
@@ -733,7 +722,7 @@ groups:
733722
'aio/content/guide/practical-observable-usage.md',
734723
'aio/content/examples/practical-observable-usage/**',
735724
'aio/content/guide/rx-library.md',
736-
'aio/content/examples/rx-library/*'
725+
'aio/content/examples/rx-library/**'
737726
])
738727
reviewers:
739728
users:
@@ -782,17 +771,18 @@ groups:
782771
conditions:
783772
- >
784773
contains_any_globs(files, [
785-
'aio/content/guide/typescript-configuration.md',
786-
'aio/content/examples/setup/**',
787-
'aio/content/guide/build.md',
788-
'aio/content/images/guide/build/**',
789-
'aio/content/guide/cli-builder.md',
790-
'aio/content/guide/deployment.md',
791-
'aio/content/images/guide/deployment/**',
792-
'aio/content/guide/file-structure.md',
793-
'aio/content/guide/ivy.md',
794-
'aio/content/guide/web-worker.md'
795-
'aio/content/guide/workspace-config.md',
774+
'aio/content/guide/typescript-configuration.md',
775+
'aio/content/examples/setup/**',
776+
'aio/content/guide/build.md',
777+
'aio/content/images/guide/build/**',
778+
'aio/content/guide/cli-builder.md',
779+
'aio/content/examples/cli-builder/**',
780+
'aio/content/guide/deployment.md',
781+
'aio/content/images/guide/deployment/**',
782+
'aio/content/guide/file-structure.md',
783+
'aio/content/guide/ivy.md',
784+
'aio/content/guide/web-worker.md'
785+
'aio/content/guide/workspace-config.md',
796786
])
797787
reviewers:
798788
users:
@@ -866,7 +856,7 @@ groups:
866856
'aio/content/examples/docs-style-guide/**',
867857
'aio/content/images/guide/docs-style-guide/**',
868858
'aio/content/guide/visual-studio-2015.md',
869-
'aio/content/examples/visual-studio-2015/*'
859+
'aio/content/examples/visual-studio-2015/**'
870860
])
871861
reviewers:
872862
users:
@@ -886,24 +876,29 @@ groups:
886876
- >
887877
contains_any_globs(files, [
888878
'*',
889-
'.buildkite/**',
890879
'.circleci/**',
891880
'.devcontainer/**',
892881
'.github/**',
893882
'.vscode/**',
883+
'.yarn/**',
894884
'docs/BAZEL.md',
895885
'packages/*',
896886
'packages/examples/test-utils/**',
897887
'packages/private/**',
898888
'scripts/**',
899889
'third_party/**',
890+
'tools/brotli-cli/**',
891+
'tools/browsers/**',
900892
'tools/build/**',
893+
'tools/circular_dependency_test/**',
901894
'tools/gulp-tasks/**',
895+
'tools/ng_rollup_bundle/**',
902896
'tools/ngcontainer/**',
903897
'tools/npm/**',
904-
'tools/public_api_guard/BUILD',
898+
'tools/public_api_guard/BUILD.bazel',
905899
'tools/public_api_guard/public_api_guard.bzl',
906900
'tools/rxjs/**',
901+
'tools/saucelabs/**',
907902
'tools/size-tracking/**',
908903
'tools/source-map-test/**',
909904
'tools/symbol-extractor/**',
@@ -913,8 +908,8 @@ groups:
913908
'tools/validate-commit-message/**',
914909
'tools/yarn/**',
915910
'tools/*',
916-
'*.bzl',
917-
'*.BAZEL'
911+
'**/*.bzl',
912+
'**/*.bazel'
918913
])
919914
reviewers:
920915
users:
@@ -934,7 +929,7 @@ groups:
934929
conditions:
935930
- >
936931
contains_any_globs(files, [
937-
'tools/material-ci/*'
932+
'tools/components-repo-ci/**'
938933
])
939934
reviewers:
940935
users:
@@ -976,7 +971,7 @@ groups:
976971
contains_any_globs(files, [
977972
'aio/scripts/_payload-limits.json',
978973
'integration/_payload-limits.json'
979-
])
974+
])
980975
reviewers:
981976
users:
982977
- IgorMinar

‎docs/TRIAGE_AND_LABELS.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,9 @@ Before a PR can be merged it must be approved by the appropriate reviewer(s).
173173

174174
To ensure that the right people review each change, we set review requests using [PullApprove](https://https://docs.pullapprove.com/) (via `.pullapprove`) and require that each PR has at least one approval from an appropriate code owner.
175175

176+
If the PR author is a code owner themselves, the approval can come from _any_ repo collaborator (person with write access).
177+
In any case, the reviewer should actually look through the code and provide feedback if necessary.
178+
176179
Note that approved state does not mean a PR is ready to be merged.
177180
For example, a reviewer might approve the PR but request a minor tweak that doesn't need further review, e.g., a rebase or small uncontroversial change.
178181
Only the `PR action: merge` label means that the PR is ready for merging.

‎scripts/github/merge-pr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ CHERRY_PICK_PR="git cherry-pick merge_pr_base..merge_pr"
131131
#
132132
# This check is used to enforce that we don't merge PRs that have not been rebased recently and could result in merging
133133
# of non-approved or otherwise bad changes.
134-
REQUIRED_BASE_SHA_MASTER="a03a9236f2aed5d00012d25f032aa43a046d91da" # pullapprove => CODEOWNERS migration
135-
REQUIRED_BASE_SHA_PATCH="a03a9236f2aed5d00012d25f032aa43a046d91da" # pullapprove => CODEOWNERS migration
134+
REQUIRED_BASE_SHA_MASTER="296dc0622f0e8c4e803ff4f19a5c6fe02a2ae66e" # CODEOWNERS => PullApprove migration
135+
REQUIRED_BASE_SHA_PATCH="110f6c91b904819cab639861b54b6a989e176942" # CODEOWNERS => PullApprove migration
136136
if [[ $MERGE_MASTER == 1 ]]; then
137137
REQUIRED_BASE_SHA="$REQUIRED_BASE_SHA_MASTER"
138138
# check patch only if patch-only PR

0 commit comments

Comments
 (0)