Port Bug 1401647 (98ec3a378b91): use a 64-bit Rust toolchain for win32 builds; r=Fallen
authorTom Prince <mozilla@hocat.ca>
Tue, 20 Mar 2018 09:59:33 -0600
changeset 23644 ace989585be984d7de7021376f0262c8a41798a5
parent 23643 dc1a28d9c0c6a877d5f23256977b069cdd01b1a9
child 23645 8bbed059de0aa3ffc85ecdee5467828b8bb26462
push id14273
push usermozilla@hocat.ca
push dateWed, 04 Apr 2018 20:29:34 +0000
treeherdercomm-central@273011fdfeca [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersFallen
bugs1401647
Port Bug 1401647 (98ec3a378b91): use a 64-bit Rust toolchain for win32 builds; r=Fallen In 89edbe9d2bf2, thunderbird switch to using the static analysis toolchain, but we should just use the regular toolchain. Differential Revision: https://phabricator.services.mozilla.com/D778
taskcluster/ci/build/windows.yml
taskcluster/ci/toolchain/kind.yml
--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -21,18 +21,18 @@ win32/opt:
         config-paths:
             - comm/mozharness
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_base_win32.py
             - builds/taskcluster_sub_win32/opt.py
     toolchains:
-        - win32-clang-cl-st-an
-        - win32-rust
+        - win64-clang-cl
+        - win64-rust
         - win64-sccache
 
 win32-nightly/opt:
     description: "Win32 Nightly"
     attributes:
         nightly: true
     index:
         product: thunderbird
@@ -58,18 +58,18 @@ win32-nightly/opt:
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_base_win32.py
             - builds/taskcluster_sub_win32/opt.py
             - disable_signing.py
             - taskcluster_nightly.py
     toolchains:
-        - win32-clang-cl-st-an
-        - win32-rust
+        - win64-clang-cl
+        - win64-rust
 
 win32/debug:
     description: "Win32 Debug"
     index:
         product: thunderbird
         job-name: win32-debug
     treeherder:
         platform: windows2012-32/debug
@@ -89,18 +89,18 @@ win32/debug:
         config-paths:
             - comm/mozharness
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_base_win32.py
             - builds/taskcluster_sub_win32/debug.py
     toolchains:
-        - win32-clang-cl-st-an
-        - win32-rust
+        - win64-clang-cl
+        - win64-rust
         - win64-sccache
 
 win64/opt:
     description: "Win64 Opt"
     index:
         product: thunderbird
         job-name: win64-opt
     treeherder:
@@ -120,17 +120,17 @@ win64/opt:
         config-paths:
             - comm/mozharness
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_base_win64.py
             - builds/taskcluster_sub_win64/opt.py
     toolchains:
-        - win64-clang-cl-st-an
+        - win64-clang-cl
         - win64-rust
         - win64-sccache
 
 win64-nightly/opt:
     description: "Win64 Nightly"
     attributes:
         nightly: true
     index:
@@ -157,17 +157,17 @@ win64-nightly/opt:
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_base_win64.py
             - builds/taskcluster_sub_win64/opt.py
             - disable_signing.py
             - taskcluster_nightly.py
     toolchains:
-        - win64-clang-cl-st-an
+        - win64-clang-cl
         - win64-rust
 
 win64/debug:
     description: "Win64 Debug"
     index:
         product: thunderbird
         job-name: win64-debug
     treeherder:
@@ -187,11 +187,11 @@ win64/debug:
         config-paths:
             - comm/mozharness
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_base_win64.py
             - builds/taskcluster_sub_win64/debug.py
     toolchains:
-        - win64-clang-cl-st-an
+        - win64-clang-cl
         - win64-rust
         - win64-sccache
--- a/taskcluster/ci/toolchain/kind.yml
+++ b/taskcluster/ci/toolchain/kind.yml
@@ -13,14 +13,12 @@ jobs:
     - linux64-gcc-4.9
     - linux64-hfsplus
     - linux64-libdmg
     - linux64-llvm-dsymutil
     - linux64-rust
     - linux64-rust-1.19
     - linux64-rust-macos
     - linux64-sccache
-    - win32-clang-cl-st-an
-    - win32-rust
-    - win64-clang-cl-st-an
+    - win64-clang-cl
     - win64-rust
     - win64-rust-1.19
     - win64-sccache