From 13d5e11d38e40c42b0bd7f767e34f6e754b31c64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Terelius?= Date: Wed, 18 Dec 2024 16:28:48 +0100 Subject: [PATCH] Bring in changes from WebRTC autoroller (2) This adds support for GCS deps No-Try: True Bug: libyuv:358992053 Change-Id: I22fd87cf783faf2b0b35df108df6cfa1fb181657 Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/6105833 Reviewed-by: Mirko Bonadei Commit-Queue: Jeremy Leconte Reviewed-by: Jeremy Leconte --- tools_libyuv/autoroller/roll_deps.py | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/tools_libyuv/autoroller/roll_deps.py b/tools_libyuv/autoroller/roll_deps.py index 6c4b3e87b..ccc29ebe8 100755 --- a/tools_libyuv/autoroller/roll_deps.py +++ b/tools_libyuv/autoroller/roll_deps.py @@ -106,6 +106,7 @@ ChangedDep = collections.namedtuple( 'ChangedDep', 'path url current_rev new_rev' ) CipdDepsEntry = collections.namedtuple('CipdDepsEntry', 'path packages') +GcsDepsEntry = collections.namedtuple('GcsDepsEntry', 'path bucket objects') VersionEntry = collections.namedtuple('VersionEntry', 'version') ChangedCipdPackage = collections.namedtuple( 'ChangedCipdPackage', 'path package current_version new_version' @@ -308,10 +309,14 @@ def BuildDepsentryDict(deps_dict): dep = {'url': dep} if dep.get('dep_type') == 'cipd': result[path] = CipdDepsEntry(path, dep['packages']) + elif dep.get('dep_type') == 'gcs': + result[path] = GcsDepsEntry(path, dep['bucket'], + dep['objects']) else: if '@' not in dep['url']: - continue - url, revision = dep['url'].split('@') + url, revision = dep['url'], 'HEAD' + else: + url, revision = dep['url'].split('@') result[path] = DepsEntry(path, url, revision) def AddVersionEntry(vars_subdict): @@ -471,10 +476,17 @@ def CalculateChangedDeps(libyuv_deps, new_cr_deps): if isinstance(cr_deps_entry, CipdDepsEntry): result.extend( - _FindChangedCipdPackages( - path, libyuv_deps_entry.packages, cr_deps_entry.packages # pylint: disable=line-too-long - ) - ) + _FindChangedCipdPackages(path, libyuv_deps_entry.packages, + cr_deps_entry.packages)) + continue + + if isinstance(cr_deps_entry, GcsDepsEntry): + result.extend( + _FindChangedVars( + path, ','.join(x['object_name'] + for x in libyuv_deps_entry.objects), + ','.join(x['object_name'] + for x in cr_deps_entry.objects))) continue if isinstance(cr_deps_entry, VersionEntry):