From c499c8f4dbfdbfb2c3346378eff30d7957b12b8a Mon Sep 17 00:00:00 2001 From: Alex Eagle Date: Wed, 7 Mar 2018 15:39:02 -0800 Subject: [PATCH] build: update angular-bot g3sync paths (#22637) We already trimmed these paths from the g3sync PR Close #22637 --- .github/angular-robot.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/angular-robot.yml b/.github/angular-robot.yml index 40eda24d69..34cb5172b1 100644 --- a/.github/angular-robot.yml +++ b/.github/angular-robot.yml @@ -26,9 +26,7 @@ merge: # list of patterns to check for the files changed by the PR # this list must be manually kept in sync with google3/third_party/javascript/angular2/copy.bara.sky include: - - "BUILD.bazel" - "LICENSE" - - "WORKSPACE" - "modules/**" - "packages/**" # list of patterns to ignore for the files changed by the PR @@ -36,6 +34,11 @@ merge: - "packages/language-service/**" - "**/.gitignore" - "**/.gitkeep" + - "**/tsconfig-build.json" + - "**/tsconfig.json" + - "**/rollup.config.js" + - "**/BUILD.bazel" + - "packages/**/test/**" # comment that will be added to a PR when there is a conflict, leave empty or set to false to disable mergeConflictComment: "Hi @{{PRAuthor}}! This PR has merge conflicts due to recent upstream merges.