Skip to content

Commit

Permalink
Bug 1522380: [win64-aarch64] Don't beetmove win64-aarch64 installers …
Browse files Browse the repository at this point in the history
…on release branches; r=nthomas

These builds aren't ready for general availability, so we don't want to publish
them. But we want to start building them now.

Differential Revision: https://phabricator.services.mozilla.com/D17453

--HG--
extra : moz-landing-system : lando
  • Loading branch information
tomprince committed Jan 25, 2019
1 parent 0b741aa commit 3b43c82
Showing 1 changed file with 18 additions and 2 deletions.
20 changes: 18 additions & 2 deletions taskcluster/taskgraph/transforms/beetmover_repackage.py
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,9 @@ def make_task_description(config, jobs):
yield task


def generate_upstream_artifacts(job, dependencies, platform, locale=None, project=None):
def generate_upstream_artifacts(
config, job, dependencies, platform, locale=None, project=None
):

build_mapping = UPSTREAM_ARTIFACT_UNSIGNED_PATHS
build_signing_mapping = UPSTREAM_ARTIFACT_SIGNED_PATHS
Expand All @@ -266,6 +268,12 @@ def generate_upstream_artifacts(job, dependencies, platform, locale=None, projec
("build", build_mapping),
("signing", build_signing_mapping),
]:
# Bug 1522380: We want to build but not publish win64-aarch64 builds on release branches
if (
platform.startswith("win64-aarch64-nightly")
and config.params["release_type"] != "nightly"
):
continue
platform_was_previously_matched_by_regex = None
for platform_regex, paths in mapping.iteritems():
if platform_regex.match(platform) is not None:
Expand Down Expand Up @@ -302,6 +310,14 @@ def generate_upstream_artifacts(job, dependencies, platform, locale=None, projec
if task_type not in dependencies:
continue

# Bug 1522380: We want to build but not publish win64-aarch64 builds on release branches
if (
platform.startswith("win64-aarch64-nightly")
and config.params["release_type"] != "nightly"
and task_type != "mar-signing"
):
continue

paths = ["{}/{}".format(artifact_prefix, path) for path in paths]
paths = [
path for path in paths
Expand Down Expand Up @@ -356,7 +372,7 @@ def make_task_worker(config, jobs):
platform = job["attributes"]["build_platform"]

upstream_artifacts = generate_upstream_artifacts(
job, job['dependencies'], platform, locale,
config, job, job['dependencies'], platform, locale,
project=config.params['project']
)

Expand Down

0 comments on commit 3b43c82

Please sign in to comment.