From 9dab8ed4ab51f3b59e80d967a6b9cd4d0684886f Mon Sep 17 00:00:00 2001 From: Tom Prince Date: Tue, 22 Jan 2019 22:18:08 +0000 Subject: [PATCH] Bug 1520686: Add win64-aarch64 l10n mozconfig; r=glandium Differential Revision: https://phabricator.services.mozilla.com/D16890 --HG-- rename : browser/config/mozconfigs/win64/l10n-mozconfig => browser/config/mozconfigs/win64-aarch64/l10n-mozconfig rename : testing/mozharness/configs/single_locale/win64.py => testing/mozharness/configs/single_locale/win64-aarch64.py extra : moz-landing-system : lando --- .../mozconfigs/win64-aarch64/l10n-mozconfig | 21 +++++++++++++++++++ taskcluster/ci/nightly-l10n/kind.yml | 8 ++++++- .../configs/merge_day/central_to_beta.py | 1 + .../configs/single_locale/win64-aarch64.py | 6 ++++++ 4 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 browser/config/mozconfigs/win64-aarch64/l10n-mozconfig create mode 100644 testing/mozharness/configs/single_locale/win64-aarch64.py diff --git a/browser/config/mozconfigs/win64-aarch64/l10n-mozconfig b/browser/config/mozconfigs/win64-aarch64/l10n-mozconfig new file mode 100644 index 000000000000..4fdd748e6f9f --- /dev/null +++ b/browser/config/mozconfigs/win64-aarch64/l10n-mozconfig @@ -0,0 +1,21 @@ +. "$topsrcdir/browser/config/mozconfigs/common" +. "$topsrcdir/browser/config/mozconfigs/win64-aarch64/common-win64" +. "$topsrcdir/build/mozconfig.no-compile" + +ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}" +ac_add_options --with-l10n-base=../../l10n +ac_add_options --with-branding=browser/branding/nightly + +ac_add_options --disable-nodejs +unset NODEJS + +export MOZILLA_OFFICIAL=1 + +# Enable Telemetry +export MOZ_TELEMETRY_REPORTING=1 + +# Don't autoclobber l10n, as this can lead to missing binaries and broken builds +# Bug 1283438 +mk_add_options AUTOCLOBBER= + +. "$topsrcdir/build/mozconfig.common.override" diff --git a/taskcluster/ci/nightly-l10n/kind.yml b/taskcluster/ci/nightly-l10n/kind.yml index d7612c5deeac..7ac80aa8ee0d 100644 --- a/taskcluster/ci/nightly-l10n/kind.yml +++ b/taskcluster/ci/nightly-l10n/kind.yml @@ -179,12 +179,18 @@ job-template: - single_locale/tc_common.py - single_locale/tc_win32.py - taskcluster_nightly.py - win64(|-aarch64-msvc)-nightly: + win64-nightly: - single_locale/firefox.py - single_locale/win64.py - single_locale/tc_common.py - single_locale/tc_win64.py - taskcluster_nightly.py + win64-aarch64-msvc-nightly: + - single_locale/firefox.py + - single_locale/win64-aarch64.py + - single_locale/tc_common.py + - single_locale/tc_win64.py + - taskcluster_nightly.py linux-devedition-nightly: - single_locale/devedition.py - single_locale/linux32.py diff --git a/testing/mozharness/configs/merge_day/central_to_beta.py b/testing/mozharness/configs/merge_day/central_to_beta.py index eaa264aedcd2..5f7700a4fb48 100644 --- a/testing/mozharness/configs/merge_day/central_to_beta.py +++ b/testing/mozharness/configs/merge_day/central_to_beta.py @@ -26,6 +26,7 @@ config = { "browser/config/mozconfigs/linux64/l10n-mozconfig", "browser/config/mozconfigs/win32/l10n-mozconfig", "browser/config/mozconfigs/win64/l10n-mozconfig", + "browser/config/mozconfigs/win64-aarch64/l10n-mozconfig", "browser/config/mozconfigs/macosx64/l10n-mozconfig"] ] + [ # File, from, to diff --git a/testing/mozharness/configs/single_locale/win64-aarch64.py b/testing/mozharness/configs/single_locale/win64-aarch64.py new file mode 100644 index 000000000000..afd4a3703f98 --- /dev/null +++ b/testing/mozharness/configs/single_locale/win64-aarch64.py @@ -0,0 +1,6 @@ +config = { + "mozconfig_platform": "win64-aarch64", + + # l10n + "ignore_locales": ["en-US", "ja-JP-mac"], +}