diff --git a/tools/bots/bot_utils.py b/tools/bots/bot_utils.py index da166aa2db6..53bd1ca4d1c 100644 --- a/tools/bots/bot_utils.py +++ b/tools/bots/bot_utils.py @@ -71,7 +71,7 @@ class GCSNamer(object): Under every base path, the following structure is used: - /VERSION - - /api-docs/{dart-api-docs.zip,dartdocs-gen-api.zip} + - /api-docs/dartdocs-gen-api.zip - /dartium/{chromedriver,content_shell,dartium} -{linux,macos,windows}-{ia32,x64}-release.zip - /sdk/dartsdk-{linux,macos,windows}-{ia32,x64}-release.zip @@ -119,6 +119,10 @@ class GCSNamer(object): return '/'.join([self.dartium_directory(revision), self.dartium_variant_zipfilename(name, system, arch, mode)]) + def apidocs_zipfilepath(self, revision): + return '/'.join([self.apidocs_directory(revision), + self.dartdocs_zipfilename()]) + def dartium_android_apk_filepath(self, revision, name, arch, mode): return '/'.join([self.dartium_android_directory(revision), self.dartium_android_apk_filename(name, arch, mode)]) @@ -162,9 +166,6 @@ class GCSNamer(object): def dartium_android_apk_filename(self, name, arch, mode): return '%s-%s-%s.apk' % (name, arch, mode) - def apidocs_zipfilename(self): - return 'dart-api-docs.zip' - def dartdocs_zipfilename(self): return 'dartdocs-gen-api.zip' diff --git a/tools/promote.py b/tools/promote.py index d3013ab7af9..81ab4025479 100644 --- a/tools/promote.py +++ b/tools/promote.py @@ -131,11 +131,10 @@ def _PromoteDartArchiveBuild(channel, revision): remove_gs_directory(to_loc) Gsutil(['-m', 'cp', '-a', 'public-read', '-R', from_loc, to_loc]) - # Copy api-docs directory. - from_loc = raw_namer.apidocs_directory(revision) - to_loc = release_namer.apidocs_directory(to_revision) - remove_gs_directory(to_loc) - Gsutil(['-m', 'cp', '-a', 'public-read', '-R', from_loc, to_loc]) + # Copy api-docs zipfile. + from_loc = raw_namer.apidocs_zipfilepath(revision) + to_loc = release_namer.apidocs_zipfilepath(to_revision) + Gsutil(['-m', 'cp', '-a', 'public-read', from_loc, to_loc]) # Copy dartium directory. from_loc = raw_namer.dartium_directory(revision)