From b35ec4a23ce35e64ee3a786146a690465436f11b Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Wed, 17 May 2023 20:54:26 +0200 Subject: [PATCH] build: modify `gclient.py` with unified patch (#38351) * build: modify gclient.py with unified patch * ci: ensure depot_tools does not update * ci: move auto-update disable outside if --- .circleci/config/base.yml | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml index feed4be92917..f9ab0243b532 100644 --- a/.circleci/config/base.yml +++ b/.circleci/config/base.yml @@ -250,14 +250,27 @@ step-depot-tools-get: &step-depot-tools-get sed -i '/ninjalog_uploader_wrapper.py/d' ./depot_tools/autoninja # Remove swift-format dep from cipd on macOS until we send a patch upstream. cd depot_tools - patch gclient.py -R \<<'EOF' - 676,677c676 - < packages = dep_value.get('packages', []) - < for package in (x for x in packages if "infra/3pp/tools/swift-format" not in x.get('package')): - --- - > for package in dep_value.get('packages', []): + cat > gclient.diff \<< 'EOF' + diff --git a/gclient.py b/gclient.py + index 3a9c5c6..f222043 100755 + --- a/gclient.py + +++ b/gclient.py + @@ -712,7 +712,8 @@ class Dependency(gclient_utils.WorkItem, DependencySettings): + + if dep_type == 'cipd': + cipd_root = self.GetCipdRoot() + - for package in dep_value.get('packages', []): + + packages = dep_value.get('packages', []) + + for package in (x for x in packages if "infra/3pp/tools/swift-format" not in x.get('package')): + deps_to_add.append( + CipdDependency( + parent=self, EOF + git apply --3way gclient.diff fi + # Ensure depot_tools does not update. + test -d depot_tools && cd depot_tools + touch .disable_auto_update step-depot-tools-add-to-path: &step-depot-tools-add-to-path run: