Skip to content

Commit

Permalink
Revert "ensure we do not double publish to CIPD (flutter#19724)" (flu…
Browse files Browse the repository at this point in the history
…tter#19759)

This reverts commit 56bb3c5.
  • Loading branch information
iskakaushik authored Jul 15, 2020
1 parent 5a431e8 commit 7b1515e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 51 deletions.
27 changes: 2 additions & 25 deletions tools/fuchsia/build_fuchsia_artifacts.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import errno
import os
import platform
import re
import shutil
import subprocess
import sys
Expand Down Expand Up @@ -176,39 +175,17 @@ def BuildBucket(runtime_mode, arch, product):
CopyIcuDepsToBucket(out_dir, deps_dir)


def CheckCIPDPackageExists(package_name, tag):
'''Check to see if the current package/tag combo has been published'''
command = [
'cipd',
'search',
package_name,
'-tag',
tag,
]
stdout = subprocess.check_output(command)
match = re.search(r'No matching instances\.', stdout)
if match:
return False
else:
return True


def ProcessCIPDPackage(upload, engine_version):
# Copy the CIPD YAML template from the source directory to be next to the bucket
# we are about to package.
cipd_yaml = os.path.join(_script_dir, 'fuchsia.cipd.yaml')
CopyFiles(cipd_yaml, os.path.join(_bucket_directory, 'fuchsia.cipd.yaml'))

tag = 'git_revision:%s' % engine_version
already_exists = CheckCIPDPackageExists('flutter/fuchsia', tag)
if already_exists:
print('CIPD package flutter/fuchsia tag %s already exists!' % tag)

if upload and IsLinux() and not already_exists:
if upload and IsLinux():
command = [
'cipd', 'create', '-pkg-def', 'fuchsia.cipd.yaml', '-ref', 'latest',
'-tag',
tag,
'git_revision:%s' % engine_version
]
else:
command = [
Expand Down
27 changes: 1 addition & 26 deletions tools/fuchsia/merge_and_upload_debug_symbols.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,34 +52,9 @@ def WriteCIPDDefinition(target_arch, out_dir, symbol_dirs):
return yaml_file


def CheckCIPDPackageExists(package_name, tag):
'''Check to see if the current package/tag combo has been published'''
command = [
'cipd',
'search',
package_name,
'-tag',
tag,
]
stdout = subprocess.check_output(command)
match = re.search(r'No matching instances\.', stdout)
if match:
return False
else:
return True


def ProcessCIPDPackage(upload, cipd_yaml, engine_version, out_dir, target_arch):
_packaging_dir = GetPackagingDir(out_dir)
tag = 'git_revision:%s' % engine_version
package_name = 'flutter/fuchsia-debug-symbols-%s' % target_arch
already_exists = CheckCIPDPackageExists(
package_name,
tag)
if already_exists:
print('CIPD package %s tag %s already exists!' % (package_name, tag))

if upload and IsLinux() and not already_exists:
if upload and IsLinux():
command = [
'cipd', 'create', '-pkg-def', cipd_yaml, '-ref', 'latest', '-tag',
'git_revision:%s' % engine_version
Expand Down

0 comments on commit 7b1515e

Please sign in to comment.