DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-13 14:21:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: content_aware_hash tag for fuchsia merge / upload (#173253)

Browse Source 
Also tag after the upload, similar to #173140
fixes: #173137
This commit is contained in:
John "codefu" McDole 2025-08-05 13:53:34 -07:00 committed by GitHub
parent de33a3b2ab
commit efa5893347
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
engine/src/flutter/tools/fuchsia/merge_and_upload_debug_symbols.py
View File

@ -87,15 +87,7 @@ def ProcessCIPDPackage(upload, cipd_yaml, engine_version, content_hash, out_dir,
if already_exists:
print('CIPD package %s tag %s already exists!' % (package_name, git_tag))
content_tag = ''
if content_hash:
content_tag = 'content_aware_hash:%s' % content_hash
content_already_exists = CheckCIPDPackageExists(package_name, content_tag)
if content_already_exists:
print('CIPD package %s tag %s already exists!' % (package_name, content_tag))
content_tag = ''
# do not return; content hash can match multiple PRs (reverts, framework only)
tag_content_hash = False
if upload and IsLinux() and not already_exists:
command = [
'cipd',
@ -109,21 +101,49 @@ def ProcessCIPDPackage(upload, cipd_yaml, engine_version, content_hash, out_dir,
'-verification-timeout',
'10m0s',
]
if content_tag:
command.extend(['-tag', content_tag])
tag_content_hash = True
else:
command = [
'cipd', 'pkg-build', '-pkg-def', cipd_yaml, '-out',
os.path.join(_packaging_dir, 'fuchsia-debug-symbols-%s.cipd' % target_arch)
]
RunCIPDCommandWithRetries(command, _packaging_dir)
if tag_content_hash:
TagBuildWithContentHash(package_name, content_hash, git_tag, _packaging_dir)
def TagBuildWithContentHash(package_name, content_hash, git_tag, _packaging_dir):
content_tag = 'content_aware_hash:%s' % content_hash
already_exists = CheckCIPDPackageExists(package_name, content_tag)
if already_exists:
print('CIPD package %s tag %s already exists!' % (package_name, content_tag))
# content hash can match multiple PRs and we cannot tag multiple times.
return
# Tag the new content hash for the git_revision. This is done separately due
# to a race condition: https://github.com/flutter/flutter/issues/173137
command = [
'cipd',
'set-tag',
package_name,
'-tag',
content_tag,
'-version',
git_tag,
]
RunCIPDCommandWithRetries(command, _packaging_dir)
def RunCIPDCommandWithRetries(command, working_dir):
# Retry up to three times. We've seen CIPD fail on verification in some
# instances. Normally verification takes slightly more than 1 minute when
# it succeeds.
num_tries = 3
for tries in range(num_tries):
try:
subprocess.check_call(command, cwd=_packaging_dir)
subprocess.check_call(command, cwd=working_dir)
break
except subprocess.CalledProcessError as error:
print('Failed %s times.\nError was: %s' % (tries + 1, error))