1
0
Fork 0

Moves artifact ABI information to directory name (#3908)

master
Mitchell Hentges 2019-07-15 09:59:54 -07:00 committed by GitHub
parent f8ef0225e1
commit 39fa62b22b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -109,7 +109,7 @@ def raptor(is_staging):
def release(channel, is_staging, version_name):
variants = get_variants_for_build_type(channel)
architectures = [variant.abi for variant in variants]
apk_paths = ["public/target.{}.apk".format(arch) for arch in architectures]
apk_paths = ["public/build/{}/target.apk".format(arch) for arch in architectures]
build_tasks = {}
signing_tasks = {}
@ -146,7 +146,7 @@ def nightly_to_production_app(is_staging, version_name):
build_type = 'nightlyLegacy'
variants = get_variants_for_build_type(build_type)
architectures = [variant.abi for variant in variants]
apk_paths = ["public/target.{}.apk".format(arch) for arch in architectures]
apk_paths = ["public/build/{}/target.apk".format(arch) for arch in architectures]
build_tasks = {}
signing_tasks = {}

View File

@ -42,7 +42,7 @@ class TaskBuilder(object):
def craft_assemble_release_task(self, architectures, build_type, is_staging, version_name):
artifacts = {
'public/target.{}.apk'.format(arch): {
'public/build/{}/target.apk'.format(arch): {
"type": 'file',
"path": '/opt/fenix/app/build/outputs/apk/'
'{arch}/{build_type}/app-{arch}-{build_type}-unsigned.apk'.format(arch=arch, build_type=build_type),
@ -411,7 +411,7 @@ class TaskBuilder(object):
description='Dep-signing variant {}'.format(variant.raw),
signing_type="dep",
assemble_task_id=assemble_task_id,
apk_paths=["public/target.apk"],
apk_paths=[DEFAULT_APK_ARTIFACT_LOCATION],
routes=routes,
treeherder={
'groupSymbol': variant.build_type,