mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

build: fix depot_tools patch application (#39742)

Browse source 
build: fix depot_tools patch application
This commit is contained in:
Shelley Vohr 2023-09-06 13:49:00 +02:00 • committed by GitHub
parent d9ba26273a
commit 34b79c15c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
.circleci/config/base.yml
View file

@ -249,19 +249,19 @@ step-depot-tools-get: &step-depot-tools-get
cd depot_tools cd depot_tools
cat > gclient.diff \<< 'EOF' cat > gclient.diff \<< 'EOF'
diff --git a/gclient.py b/gclient.py diff --git a/gclient.py b/gclient.py
index 3a9c5c6..f222043 100755 index c305c248..e6e0fbdc 100755
--- a/gclient.py --- a/gclient.py
+++ b/gclient.py +++ b/gclient.py
@@ -712,7 +712,8 @@ class Dependency(gclient_utils.WorkItem, DependencySettings): @@ -735,7 +735,8 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
if dep_type == 'cipd': if dep_type == 'cipd':
cipd_root = self.GetCipdRoot() cipd_root = self.GetCipdRoot()
- for package in dep_value.get('packages', []): - for package in dep_value.get('packages', []):
+ packages = 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')): + for package in (x for x in packages if "infra/3pp/tools/swift-format" not in x.get('package')):
deps_to_add.append( deps_to_add.append(
CipdDependency( CipdDependency(parent=self,
parent=self, name=name,
EOF EOF
git apply --3way gclient.diff git apply --3way gclient.diff
fi fi