Fix releasing of desugared library JDK-11 legacy
Change-Id: I8546866e4388ed4c6081940bf3cb0f5bfe640d54
diff --git a/tools/r8_release.py b/tools/r8_release.py
index f7f0c15..cc30e74 100755
--- a/tools/r8_release.py
+++ b/tools/r8_release.py
@@ -567,12 +567,10 @@
% library_version)
sys.exit(1)
- library_archive = DESUGAR_JDK_LIBS + '.zip'
- library_jar = DESUGAR_JDK_LIBS + '.jar'
- library_artifact_id = \
- '%s:%s:%s' % (ANDROID_TOOLS_PACKAGE, DESUGAR_JDK_LIBS, library_version)
-
postfix = "" if library_version.startswith('1.1') else '_jdk11_legacy'
+ library_archive = DESUGAR_JDK_LIBS + postfix + '.zip'
+ library_jar = DESUGAR_JDK_LIBS + postfix + '.jar'
+
configuration_archive = DESUGAR_JDK_LIBS_CONFIGURATION + postfix + '.zip'
with utils.TempDir() as temp:
@@ -590,9 +588,11 @@
args, [library_gfile, configuration_gfile])
print("Staged Release ID " + release_id + ".\n")
+ library_artifact_id = \
+ '%s:%s:%s' % (ANDROID_TOOLS_PACKAGE, DESUGAR_JDK_LIBS, library_version)
gmaven_publisher_stage_redir_test_info(
release_id,
- "com.android.tools:%s:%s" % (DESUGAR_JDK_LIBS, library_version),
+ library_artifact_id,
library_jar)
print("")
diff --git a/tools/trigger.py b/tools/trigger.py
index d87cad9..d716a55 100755
--- a/tools/trigger.py
+++ b/tools/trigger.py
@@ -23,6 +23,7 @@
TRIGGERS_RE = r'^ triggers: "(\w.*)"'
DESUGAR_JDK11_BOT = 'lib_desugar-archive-jdk11'
+DESUGAR_JDK11_LEGACY_BOT = 'lib_desugar-archive-jdk11-legacy'
DESUGAR_JDK8_BOT = 'lib_desugar-archive-jdk8'
def ParseOptions():
@@ -37,6 +38,9 @@
result.add_option('--desugar-jdk11',
help='Run the jdk11 library desugar and archiving bot.',
default=False, action='store_true')
+ result.add_option('--desugar-jdk11-legacy',
+ help='Run the jdk11 legacy library desugar and archiving bot.',
+ default=False, action='store_true')
result.add_option('--desugar-jdk8',
help='Run the jdk8 library desugar and archiving bot.',
default=False, action='store_true')
@@ -66,6 +70,7 @@
assert 'release' not in builder, builder
main_builders.append(builder)
print('Desugar jdk11 builder:\n ' + DESUGAR_JDK11_BOT)
+ print('Desugar jdk11 legacy builder:\n ' + DESUGAR_JDK11_LEGACY_BOT)
print('Desugar jdk8 builder:\n ' + DESUGAR_JDK8_BOT)
print('Main builders:\n ' + '\n '.join(main_builders))
print('Release builders:\n ' + '\n '.join(release_builders))
@@ -90,7 +95,7 @@
def Main():
(options, args) = ParseOptions()
- desugar = options.desugar_jdk11 or options.desugar_jdk8
+ desugar = options.desugar_jdk11 or options.desugar_jdk11_legacy or options.desugar_jdk8
if len(args) != 1 and not options.cl and not desugar:
print('Takes exactly one argument, the commit to run')
return 1
@@ -111,8 +116,13 @@
assert builder in main_builders or builder in release_builders
builders = [options.builder]
if desugar:
- assert options.desugar_jdk8 or options.desugar_jdk11
- builders = [DESUGAR_JDK8_BOT if options.desugar_jdk8 else DESUGAR_JDK11_BOT]
+ assert options.desugar_jdk11 or options.desugar_jdk11_legacy or options.desugar_jdk8
+ if options.desugar_jdk11:
+ builders = [DESUGAR_JDK11_BOT]
+ elif options.desugar_jdk11_legacy:
+ builders = [DESUGAR_JDK11_LEGACY_BOT]
+ else:
+ builders = [DESUGAR_JDK8_BOT]
commit = git_utils.GetHeadRevision(utils.REPO_ROOT, use_main=True)
if options.cl:
trigger_cl(builders, options.cl)
