Bug 1546845 - Remove separate win64-aarch64 rust toolchain. r=nalexander
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 25 Apr 2019 01:58:24 +0000
changeset 530052 006af3739e105d6acd7a3a143e81ea9b0a46d691
parent 530051 2a3c00a2d76186a205fd4e6d0496c28748cb2f3a
child 530053 8ca248347c5b8f645d3fb286569d6536dddb42bf
push id11265
push userffxbld-merge
push dateMon, 13 May 2019 10:53:39 +0000
treeherdermozilla-beta@77e0fe8dbdd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1546845
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1546845 - Remove separate win64-aarch64 rust toolchain. r=nalexander It was necessary when it was a different version than win64-rust, but that's not the case anymore. Differential Revision: https://phabricator.services.mozilla.com/D28761
taskcluster/ci/build/windows.yml
taskcluster/ci/toolchain/rust.yml
--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -932,17 +932,17 @@ win64-aarch64/debug:
             - builds/releng_base_firefox.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_sub_win64/debug.py
         extra-config:
             mozconfig_platform: win64-aarch64
         mozconfig-variant: debug
     toolchains:
         - win64-clang-cl
-        - win64-aarch64-rust
+        - win64-rust
         - win64-rust-size
         - win64-cbindgen
         - win64-sccache
         - win64-nasm
         - win64-node
 
 win64-aarch64/opt:
     description: "AArch64 Win64 Opt"
@@ -970,17 +970,17 @@ win64-aarch64/opt:
             - builds/releng_base_firefox.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_base_win64.py
         extra-config:
             stage_platform: win64-aarch64
             mozconfig_platform: win64-aarch64
     toolchains:
         - win64-clang-cl
-        - win64-aarch64-rust
+        - win64-rust
         - win64-rust-size
         - win64-cbindgen
         - win64-sccache
         - win64-nasm
         - win64-node
 
 win64-aarch64-eme/opt:
     description: "AArch64 Win64 Opt w/ EME"
@@ -1102,17 +1102,17 @@ win64-aarch64-shippable-no-eme/opt:
             - builds/taskcluster_base_windows.py
             - taskcluster_nightly.py
         extra-config:
             stage_platform: win64-aarch64
             mozconfig_platform: win64-aarch64
     run-on-projects: []
     toolchains:
         - win64-clang-cl
-        - win64-aarch64-rust
+        - win64-rust
         - win64-rust-size
         - win64-cbindgen
         - win64-nasm
         - win64-node
 
 
 win64-aarch64-devedition-nightly/opt:
     description: "AArch64 Win64 MSVC Devedition Nightly"
@@ -1146,17 +1146,17 @@ win64-aarch64-devedition-nightly/opt:
             - taskcluster_nightly.py
         extra-config:
             stage_platform: win64-aarch64
             mozconfig_platform: win64-aarch64
         mozconfig-variant: devedition
     run-on-projects: ['mozilla-beta']
     toolchains:
         - win64-clang-cl
-        - win64-aarch64-rust
+        - win64-rust
         - win64-rust-size
         - win64-cbindgen
         - win64-nasm
         - win64-node
 
 
 win32-gcp/debug:
     description: "Win32 Debug - built on GCP"
--- a/taskcluster/ci/toolchain/rust.yml
+++ b/taskcluster/ci/toolchain/rust.yml
@@ -154,16 +154,17 @@ win64-rust-1.34:
     treeherder:
         symbol: TW64(rust)
     run:
         arguments: [
             '--channel', '1.34.0',
             '--host', 'x86_64-pc-windows-msvc',
             '--target', 'x86_64-pc-windows-msvc',
             '--target', 'i686-pc-windows-msvc',
+            '--target', 'aarch64-pc-windows-msvc',
         ]
         toolchain-alias: win64-rust
         toolchain-artifact: public/build/rustc.tar.bz2
 
 win64-rust-nightly:
     description: "rust nightly repack"
     treeherder:
         symbol: TW64(rust-nightly)
@@ -171,30 +172,16 @@ win64-rust-nightly:
         arguments: [
             '--channel', 'nightly-2018-12-14',
             '--host', 'x86_64-pc-windows-msvc',
             '--target', 'x86_64-pc-windows-msvc',
             '--target', 'i686-pc-windows-msvc',
         ]
         toolchain-artifact: public/build/rustc.tar.bz2
 
-win64-aarch64-rust:
-    description: "rust repack with aarch64 support"
-    treeherder:
-        symbol: TW64(rust-aarch64)
-    run:
-        arguments: [
-            '--channel', '1.34.0',
-            '--host', 'x86_64-pc-windows-msvc',
-            '--target', 'x86_64-pc-windows-msvc',
-            '--target', 'aarch64-pc-windows-msvc',
-            '--target', 'i686-pc-windows-msvc',
-        ]
-        toolchain-artifact: public/build/rustc.tar.bz2
-
 mingw32-rust-1.31:
     treeherder:
         symbol: TMW(rust-1.31)
     run:
         arguments: [
             '--channel', '1.31.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'i686-unknown-linux-gnu',