Bug 1512822 - Remove "MSVC" from the name of AArch64 builds r=tomprince

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

--HG--
extra : moz-landing-system : lando
This commit is contained in:
David Major 2019-01-24 15:02:06 +00:00
parent 820c1361b4
commit aba5821724
23 changed files with 258 additions and 260 deletions

View File

@ -24,4 +24,6 @@ ac_add_options --with-branding=browser/branding/nightly
. $topsrcdir/build/win64-aarch64/mozconfig.vs-latest
unset ENABLE_CLANG_PLUGIN
. "$topsrcdir/build/mozconfig.common.override"

View File

@ -1,3 +0,0 @@
. "$topsrcdir/browser/config/mozconfigs/win64-aarch64/debug"
unset ENABLE_CLANG_PLUGIN

File diff suppressed because it is too large Load Diff

View File

@ -10,8 +10,8 @@
"win32",
"win32-devedition",
"win64",
"win64-aarch64-msvc",
"win64-aarch64-msvc-devedition",
"win64-aarch64",
"win64-aarch64-devedition",
"win64-devedition"
],
"revision": "default"
@ -27,8 +27,8 @@
"win32",
"win32-devedition",
"win64",
"win64-aarch64-msvc",
"win64-aarch64-msvc-devedition",
"win64-aarch64",
"win64-aarch64-devedition",
"win64-devedition"
],
"revision": "default"
@ -44,8 +44,8 @@
"win32",
"win32-devedition",
"win64",
"win64-aarch64-msvc",
"win64-aarch64-msvc-devedition",
"win64-aarch64",
"win64-aarch64-devedition",
"win64-devedition"
],
"revision": "default"
@ -59,8 +59,8 @@
"win32",
"win32-devedition",
"win64",
"win64-aarch64-msvc",
"win64-aarch64-msvc-devedition",
"win64-aarch64",
"win64-aarch64-devedition",
"win64-devedition"
],
"revision": "default"

View File

@ -21,7 +21,7 @@ not-for-build-platforms:
- macosx64-nightly/opt
- win32-nightly/opt
- win64-nightly/opt
- win64-aarch64-msvc-nightly/opt
- win64-aarch64-nightly/opt
- linux-devedition-nightly/opt
- linux64-devedition-nightly/opt
- macosx64-devedition-nightly/opt

View File

@ -22,7 +22,7 @@ not-for-build-platforms:
- macosx64-nightly/opt
- win32-nightly/opt
- win64-nightly/opt
- win64-aarch64-msvc-nightly/opt
- win64-aarch64-nightly/opt
- linux-devedition-nightly/opt
- linux64-devedition-nightly/opt
- macosx64-devedition-nightly/opt

View File

@ -37,7 +37,7 @@ only-for-build-platforms:
- macosx64-nightly/opt
- win32-nightly/opt
- win64-nightly/opt
- win64-aarch64-msvc-nightly/opt
- win64-aarch64-nightly/opt
- linux-devedition-nightly/opt
- linux64-devedition-nightly/opt
- macosx64-devedition-nightly/opt

View File

@ -21,7 +21,7 @@ not-for-build-platforms:
- macosx64-nightly/opt
- win32-nightly/opt
- win64-nightly/opt
- win64-aarch64-msvc-nightly/opt
- win64-aarch64-nightly/opt
- linux-devedition-nightly/opt
- linux64-devedition-nightly/opt
- macosx64-devedition-nightly/opt

View File

@ -1071,23 +1071,23 @@ win64-msvc/opt:
- win64-sccache
- win64-node
win64-aarch64-msvc/debug:
description: "AArch64 Win64 MSVC Debug"
win64-aarch64/debug:
description: "AArch64 Win64 Debug"
index:
product: firefox
job-name: win64-aarch64-msvc-debug
job-name: win64-aarch64-debug
attributes:
enable-full-crashsymbols: true
treeherder:
platform: windows2012-aarch64/debug
symbol: Bmsvc
symbol: B
tier: 1
worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
worker:
max-run-time: 7200
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/aarch64.manifest"
PERFHERDER_EXTRA_OPTIONS: msvc-aarch64
PERFHERDER_EXTRA_OPTIONS: aarch64
run:
using: mozharness
actions: [get-secrets, build]
@ -1099,7 +1099,7 @@ win64-aarch64-msvc/debug:
- builds/taskcluster_sub_win64/debug.py
extra-config:
mozconfig_platform: win64-aarch64
mozconfig-variant: debug-msvc
mozconfig-variant: debug
run-on-projects: ['mozilla-central', 'trunk', 'try']
toolchains:
- win64-clang-cl
@ -1108,23 +1108,23 @@ win64-aarch64-msvc/debug:
- win64-sccache
- win64-node
win64-aarch64-msvc/opt:
description: "AArch64 Win64 MSVC Opt"
win64-aarch64/opt:
description: "AArch64 Win64 Opt"
index:
product: firefox
job-name: win64-aarch64-msvc-opt
job-name: win64-aarch64-opt
attributes:
enable-full-crashsymbols: true
treeherder:
platform: windows2012-aarch64/opt
symbol: Bmsvc
symbol: B
tier: 1
worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
worker:
max-run-time: 7200
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/aarch64.manifest"
PERFHERDER_EXTRA_OPTIONS: msvc-aarch64
PERFHERDER_EXTRA_OPTIONS: aarch64
run:
using: mozharness
actions: [get-secrets, build]
@ -1144,11 +1144,11 @@ win64-aarch64-msvc/opt:
- win64-sccache
- win64-node
win64-aarch64-msvc-nightly/opt:
description: "AArch64 Win64 MSVC Nightly"
win64-aarch64-nightly/opt:
description: "AArch64 Win64 Nightly"
index:
product: firefox
job-name: win64-aarch64-msvc-opt
job-name: win64-aarch64-opt
type: nightly
attributes:
nightly: true
@ -1163,7 +1163,7 @@ win64-aarch64-msvc-nightly/opt:
max-run-time: 7200
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/aarch64.manifest"
PERFHERDER_EXTRA_OPTIONS: msvc-aarch64
PERFHERDER_EXTRA_OPTIONS: aarch64
run:
using: mozharness
actions: [get-secrets, build]

View File

@ -24,7 +24,7 @@ only-for-build-platforms:
- win32-devedition-nightly/opt
- win64-nightly/opt
- win64-devedition-nightly/opt
- win64-aarch64-msvc-nightly/opt
- win64-aarch64-nightly/opt
job-template:
shipping-phase: promote

View File

@ -24,7 +24,7 @@ only-for-build-platforms:
- win32-devedition-nightly/opt
- win64-nightly/opt
- win64-devedition-nightly/opt
- win64-aarch64-msvc-nightly/opt
- win64-aarch64-nightly/opt
- linux64-asan-reporter-nightly/opt
- win64-asan-reporter-nightly/opt

View File

@ -28,7 +28,7 @@ only-for-build-platforms:
- macosx64-nightly/opt
- win32-nightly/opt
- win64-nightly/opt
- win64-aarch64-msvc-nightly/opt
- win64-aarch64-nightly/opt
- linux64-devedition-nightly/opt
- linux-devedition-nightly/opt
- macosx64-devedition-nightly/opt
@ -85,7 +85,7 @@ job-template:
win32-devedition-nightly: internal
win64-nightly: internal
win64-devedition-nightly: internal
win64-aarch64-msvc-nightly: internal
win64-aarch64-nightly: internal
index:
type: nightly-l10n
product:
@ -100,7 +100,7 @@ job-template:
macosx64-nightly: macosx64-opt
win32-nightly: win32-opt
win64-nightly: win64-opt
win64-aarch64-msvc-nightly: win64-aarch64-msvc-opt
win64-aarch64-nightly: win64-aarch64-opt
linux-devedition-nightly: linux-devedition-opt
linux64-devedition-nightly: linux64-devedition-opt
macosx64-devedition-nightly: macosx64-devedition-opt
@ -125,7 +125,7 @@ job-template:
macosx64-nightly: osx-cross/opt
win32-nightly: windows2012-32/opt
win64-nightly: windows2012-64/opt
win64-aarch64-msvc-nightly: windows2012-aarch64/opt
win64-aarch64-nightly: windows2012-aarch64/opt
linux64-devedition-nightly: linux64-devedition/opt
linux-devedition-nightly: linux32-devedition/opt
macosx64-devedition-nightly: osx-cross-devedition/opt
@ -185,7 +185,7 @@ job-template:
- single_locale/tc_common.py
- single_locale/tc_win64.py
- taskcluster_nightly.py
win64-aarch64-msvc-nightly:
win64-aarch64-nightly:
- single_locale/firefox.py
- single_locale/win64-aarch64.py
- single_locale/tc_common.py

View File

@ -23,7 +23,7 @@ only-for-build-platforms:
- win32-devedition-nightly/opt
- win64-nightly/opt
- win64-devedition-nightly/opt
- win64-aarch64-msvc-nightly/opt
- win64-aarch64-nightly/opt
- linux-nightly/opt
- linux-devedition-nightly/opt
- linux64-nightly/opt

View File

@ -22,7 +22,7 @@ only-for-build-platforms:
- macosx64-nightly/opt
- win32-nightly/opt
- win64-nightly/opt
- win64-aarch64-msvc-nightly/opt
- win64-aarch64-nightly/opt
- linux-devedition-nightly/opt
- linux64-devedition-nightly/opt
- macosx64-devedition-nightly/opt

View File

@ -20,5 +20,5 @@ only-for-build-platforms:
- win64-nightly/opt
- win64-devedition-nightly/opt
- win64/opt
- win64-aarch64-msvc-nightly/opt
- win64-aarch64-nightly/opt
- win64-asan-reporter-nightly/opt

View File

@ -20,5 +20,5 @@ only-for-build-platforms:
- win64-nightly/opt
- win64-devedition-nightly/opt
- win64/opt
- win64-aarch64-msvc-nightly/opt
- win64-aarch64-nightly/opt
- win64-asan-reporter-nightly/opt

View File

@ -32,7 +32,7 @@ only-for-build-platforms:
- win32/opt
- win64-nightly/opt
- win64-devedition-nightly/opt
- win64-aarch64-msvc-nightly/opt
- win64-aarch64-nightly/opt
- win64/opt
- win64-asan-reporter-nightly/opt

View File

@ -530,7 +530,7 @@ def target_tasks_nightly_win64_aarch64(full_task_graph, parameters, graph_config
"""Select the set of tasks required for a nightly build of win32 and win64.
The nightly build process involves a pipeline of builds, signing,
and, eventually, uploading the tasks to balrog."""
filter = make_nightly_filter({'win64-aarch64-msvc-nightly'})
filter = make_nightly_filter({'win64-aarch64-nightly'})
return [l for l, t in full_task_graph.tasks.iteritems() if filter(t, parameters)]

View File

@ -272,7 +272,6 @@ def craft_release_properties(config, job):
params = config.params
build_platform = job['attributes']['build_platform']
build_platform = build_platform.replace('-nightly', '')
build_platform = build_platform.replace('-msvc', '')
if build_platform.endswith("-source"):
build_platform = build_platform.replace('-source', '-release')

View File

@ -92,7 +92,7 @@ UPSTREAM_ARTIFACT_UNSIGNED_PATHS = _compile_regex_mapping({
"host/bin/mar.exe",
"host/bin/mbsdiff.exe",
]),
r'^win(32|64(|-aarch64-msvc))(|-devedition)-nightly$':
r'^win(32|64(|-aarch64))(|-devedition)-nightly$':
_DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_EN_US + [
'host/bin/mar.exe',
'host/bin/mbsdiff.exe',
@ -108,7 +108,7 @@ UPSTREAM_ARTIFACT_UNSIGNED_PATHS = _compile_regex_mapping({
UPSTREAM_ARTIFACT_SIGNED_PATHS = _compile_regex_mapping({
r'^linux(|64)(|-devedition|-asan-reporter)-nightly(|-l10n)$':
['target.tar.bz2', 'target.tar.bz2.asc'],
r'^win(32|64)(|-aarch64-msvc)(|-devedition|-asan-reporter)-nightly(|-l10n)$': ['target.zip'],
r'^win(32|64)(|-aarch64)(|-devedition|-asan-reporter)-nightly(|-l10n)$': ['target.zip'],
})
# Until bug 1331141 is fixed, if you are adding any new artifacts here that

View File

@ -13,7 +13,7 @@ logger = logging.getLogger(__name__)
PLATFORM_RENAMES = {
'windows2012-32': 'win32',
'windows2012-64': 'win64',
'windows2012-aarch64': 'win64-aarch64-msvc',
'windows2012-aarch64': 'win64-aarch64',
'osx-cross': 'macosx64',
}
@ -48,7 +48,7 @@ BALROG_PLATFORM_MAP = {
"win64-asan-reporter": [
"WINNT_x86_64-msvc-x64-asan"
],
"win64-aarch64-msvc": [
"win64-aarch64": [
"WINNT_aarch64-msvc-aarch64",
],
}

View File

@ -43,14 +43,14 @@ config = {
"ja-JP-mac": [
"linux", "linux-devedition", "linux64", "linux64-devedition",
"win32", "win32-devedition", "win64", "win64-devedition",
"win64-aarch64-msvc", "win64-aarch64-msvc-devedition",
"win64-aarch64", "win64-aarch64-devedition",
],
},
"platform_configs": [{
"platforms": [
"linux", "linux-devedition", "linux64", "linux64-devedition",
"macosx64", "macosx64-devedition", "win32", "win32-devedition",
"win64", "win64-devedition", "win64-aarch64-msvc", "win64-aarch64-msvc-devedition",
"win64", "win64-devedition", "win64-aarch64", "win64-aarch64-devedition",
],
"path": "browser/locales/shipped-locales",
"format": "shipped-locales",

View File

@ -44,14 +44,14 @@ config = {
"ja-JP-mac": [
"linux", "linux-devedition", "linux64", "linux64-devedition",
"win32", "win32-devedition", "win64", "win64-devedition",
"win64-aarch64-msvc", "win64-aarch64-msvc-devedition",
"win64-aarch64", "win64-aarch64-devedition",
],
},
"platform_configs": [{
"platforms": [
"linux", "linux-devedition", "linux64", "linux64-devedition",
"macosx64", "macosx64-devedition", "win32", "win32-devedition",
"win64", "win64-devedition", "win64-aarch64-msvc", "win64-aarch64-msvc-devedition",
"win64", "win64-devedition", "win64-aarch64", "win64-aarch64-devedition",
],
"path": "browser/locales/all-locales",
}],