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

build: fix depot_tools patch (#42388)

Browse source 
build: fix depot_tools patch
This commit is contained in:
Shelley Vohr 2024-06-06 22:49:59 +02:00 committed by GitHub
parent 6ccb9861f6
commit 1c6d7d7ece
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.circleci/config/base.yml
View file

@ -260,9 +260,9 @@ step-depot-tools-get: &step-depot-tools-get
index c305c248..e6e0fbdc 100755 index c305c248..e6e0fbdc 100755
--- a/gclient.py --- a/gclient.py
+++ b/gclient.py +++ b/gclient.py
@@ -735,7 +735,8 @@ class Dependency(gclient_utils.WorkItem, DependencySettings): @@ -783,7 +783,8 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
not condition or "non_git_source" not in condition):
if dep_type == 'cipd': continue
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', [])

6
.github/workflows/config/gclient.diff vendored
View file

@ -2,9 +2,9 @@ diff --git a/gclient.py b/gclient.py
index 59e2b4c5197928bdba1ef69bdbe637d7dfe471c1..b4bae5e48c83c84bd867187afaf40eed16e69851 100755 index 59e2b4c5197928bdba1ef69bdbe637d7dfe471c1..b4bae5e48c83c84bd867187afaf40eed16e69851 100755
--- a/gclient.py --- a/gclient.py
+++ b/gclient.py +++ b/gclient.py
@@ -739,7 +739,8 @@ class Dependency(gclient_utils.WorkItem, DependencySettings): @@ -783,7 +783,8 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
not condition or "non_git_source" not in condition):
if dep_type == 'cipd': continue
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', [])