blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Infers release architectures from gradle (#2892)

master
Mitchell Hentges 2019-05-28 12:24:06 +02:00 committed by GitHub
parent 06bf7a4da7
commit 69c4850789
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
automation/taskcluster/decision_task.py
View File

@ -15,7 +15,7 @@ import re
import taskcluster
from lib.gradle import get_debug_variants, get_geckoview_versions
from lib.gradle import get_variants_for_build_type, get_geckoview_versions
from lib.tasks import (
fetch_mozharness_task_id,
schedule_task_graph,
@ -61,7 +61,7 @@ def pr_or_push(is_push):
signing_tasks = {}
other_tasks = {}
for variant in get_debug_variants():
for variant in get_variants_for_build_type('debug'):
assemble_task_id = taskcluster.slugId()
build_tasks[assemble_task_id] = BUILDER.craft_assemble_task(variant)
build_tasks[taskcluster.slugId()] = BUILDER.craft_test_task(variant)
@ -107,7 +107,8 @@ def raptor(is_staging):
def release(track, is_staging, version_name):
architectures = ['x86', 'arm', 'aarch64']
variants = get_variants_for_build_type(track)
architectures = [variant.abi for variant in variants]
apk_paths = ["public/target.{}.apk".format(arch) for arch in architectures]
build_tasks = {}

4
automation/taskcluster/lib/gradle.py
View File

@ -9,7 +9,7 @@ import subprocess
from lib.variant import Variant
def get_debug_variants():
def get_variants_for_build_type(build_type):
print("Fetching build variants from gradle")
output = _run_gradle_process('printBuildVariants')
content = _extract_content_from_command_output(output, prefix='variants: ')
@ -21,7 +21,7 @@ def get_debug_variants():
print("Got variants: {}".format(variants))
return [Variant(variant_dict['name'], variant_dict['abi'], variant_dict['isSigned'], variant_dict['buildType'])
for variant_dict in variants
if variant_dict['buildType'] == 'debug']
if variant_dict['buildType'] == build_type]
def get_geckoview_versions():