diff --git a/.circleci/config.yml b/.circleci/config.yml index 46f927cb4270..2696006fbd5d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,7 +31,6 @@ jobs: - path-filtering/set-parameters: base-revision: main mapping: | - ^((?!docs/).)*$ run-build-mac true ^((?!docs/).)*$ run-build-linux true docs/.* run-docs-only true ^((?!docs/).)*$ run-docs-only false diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml index 95afdbd28173..8fc2f94fa2cb 100644 --- a/.circleci/config/base.yml +++ b/.circleci/config/base.yml @@ -188,8 +188,7 @@ step-depot-tools-get: &step-depot-tools-get CipdDependency(parent=self, name=name, EOF - git apply --3way gclient.diff - fi + git apply --3way gclient.diff # Ensure depot_tools does not update. test -d depot_tools && cd depot_tools touch .disable_auto_update