diff --git a/.pullapprove.yml b/.pullapprove.yml index 81267526ee8e21..344ca8ce059fea 100644 --- a/.pullapprove.yml +++ b/.pullapprove.yml @@ -238,7 +238,46 @@ groups: request: 0 # Do not auto-add ############################################################ - # Base Required Reviewers + # Folder specific review requirements. A PR must meet all + # folder specific review requirements for all folders that + # it touches with specific requirements defined. + ############################################################ + + folder-reviewers-scripts-build-integrations-docker: + type: optional + conditions: + - "files.include('scripts/build/*') or files.include('integrations/docker/*')" + reviewers: + users: + - andy31415 + reviews: + # 1 review request will be sent at a time + request: 1 + + folder-reviewers-google: + type: required + conditions: + - "files.include('examples/chef/*') or files.include('integrations/cloudbuild/*')" + requirements: + - "len(groups.approved.include('shared-reviewers-google')) >= 1 or \ + len(groups.approved.include('shared-reviewers-*')) >= 2" + reviews: + required: 0 + + folder-reviewers-apple: + type: required + conditions: + - "files.include('src/darwin/*').exclude('src/darwin/Framework/CHIP/zap-generated/*') or \ + files.include('src/platform/Darwin/*')" + reviewers: + teams: [reviewers-apple] + reviews: + request: 0 + required: 1 + + ############################################################ + # Base Required Reviewers. If PR touches a path not covered + # by any folder specific review requirements. ############################################################ required-reviewers: description: > @@ -247,6 +286,14 @@ groups: This is the main group of required reviews for general pull requests. type: required + conditions: + # If PR touches a region not covered by any custom review paths, base condition is required. + - "files\ + .exclude('examples/chef/*')\ + .exclude('integrations/cloudbuild/*')\ + .exclude('src/darwin/*')\ + .exclude('src/platform/Darwin/*') or \ + files.include('src/darwin/Framework/CHIP/zap-generated/*')" requirements: - len(groups.approved.include('shared-reviewers-*')) >= 2 reviews: diff --git a/examples/chef/common/stubs.cpp b/examples/chef/common/stubs.cpp index 92c1cc879bfddd..5e912b2d1196c5 100644 --- a/examples/chef/common/stubs.cpp +++ b/examples/chef/common/stubs.cpp @@ -6,6 +6,10 @@ #include #include +/** + * TODO: Remove this comment. + */ + using chip::app::DataModel::Nullable; using namespace chef; diff --git a/integrations/cloudbuild/chef.yaml b/integrations/cloudbuild/chef.yaml index 6bca9e790d4c4b..fdf2cacd59756a 100644 --- a/integrations/cloudbuild/chef.yaml +++ b/integrations/cloudbuild/chef.yaml @@ -89,3 +89,5 @@ artifacts: options: machineType: "E2_HIGHCPU_32" diskSizeGb: 500 + +# TODO: Remove this comment. diff --git a/integrations/docker/build.sh b/integrations/docker/build.sh index db1976da538a35..f656128fb5a6f6 100755 --- a/integrations/docker/build.sh +++ b/integrations/docker/build.sh @@ -121,3 +121,5 @@ if [ -f "$DOCKER_VOLUME_PATH" ]; then fi exit 0 + +# TODO: Remove this comment. diff --git a/scripts/build/BUILD.gn b/scripts/build/BUILD.gn index a109bb935fd2f7..f83074d5ee82c1 100644 --- a/scripts/build/BUILD.gn +++ b/scripts/build/BUILD.gn @@ -72,3 +72,4 @@ pw_python_package("build_examples") { "build/test_target.py", ] } +# TODO: Remove this comment. diff --git a/src/darwin/Framework/CHIP/BUILD.gn b/src/darwin/Framework/CHIP/BUILD.gn index 4421397e97421f..71f10d8688c716 100644 --- a/src/darwin/Framework/CHIP/BUILD.gn +++ b/src/darwin/Framework/CHIP/BUILD.gn @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +# TODO remove this comment. + import("//build_overrides/chip.gni") config("darwin_config") {