Backed out 3 changesets (bug 1595218) for build bustages. CLOSED TREE
authorRazvan Maries <rmaries@mozilla.com>
Thu, 05 Dec 2019 02:53:04 +0200
changeset 505574 62a4bef34ce79d5f4c75d8577aa8c7a2eff83d87
parent 505573 58bfe894a732551164c906580dada97d91e41668
child 505575 ba237def08d57263dda0232d34526ee3b3b265ca
push id102350
push userrmaries@mozilla.com
push dateThu, 05 Dec 2019 01:17:51 +0000
treeherderautoland@62a4bef34ce7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1595218
milestone73.0a1
backs out499b0c27da4fb10f06b17b0b6ad433ed9563412b
f2f230a3028d0ac0d951412ea00639cd3508d159
93ec75efbf4117c8a4a6817c0627064d0a3ad31d
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
Backed out 3 changesets (bug 1595218) for build bustages. CLOSED TREE Backed out changeset 499b0c27da4f (bug 1595218) Backed out changeset f2f230a3028d (bug 1595218) Backed out changeset 93ec75efbf41 (bug 1595218)
build/moz.configure/rust.configure
python/mozboot/mozboot/base.py
python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
taskcluster/ci/toolchain/dist-toolchains.yml
taskcluster/ci/toolchain/misc.yml
taskcluster/ci/toolchain/rust.yml
--- a/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
@@ -265,20 +265,19 @@ def rust_triple_alias(host_or_target, ho
                 else:
                     suffix = 'windows-msvc'
                 narrowed = [c for c in candidates if c.rust_target.endswith('-{}'.format(suffix))]
                 if len(narrowed) == 1:
                     return narrowed[0].rust_target
                 elif narrowed:
                     candidates = narrowed
 
-                vendor_aliases = {'pc': ('w64', 'windows')}
+                vendor_aliases = {'pc': 'w64'}
                 narrowed = [c for c in candidates
-                            if host_or_target.vendor in vendor_aliases.get(c.target.vendor, ())]
-
+                            if vendor_aliases.get(c.target.vendor) == host_or_target.vendor]
                 if len(narrowed) == 1:
                     return narrowed[0].rust_target
 
             # - For arm targets, correlate with arm_target
             #   we could be more thorough with the supported rust targets, but they
             #   don't support OSes that are supported to build Gecko anyways.
             #   Also, sadly, the only interface to check the rust target cpu features
             #   is --print target-spec-json, and it's unstable, so we have to rely on
--- a/python/mozboot/mozboot/base.py
+++ b/python/mozboot/mozboot/base.py
@@ -153,17 +153,17 @@ ac_add_options --enable-artifact-builds
 
 # Upgrade Mercurial older than this.
 MODERN_MERCURIAL_VERSION = LooseVersion('4.8')
 
 # Upgrade Python older than this.
 MODERN_PYTHON_VERSION = LooseVersion('2.7.3')
 
 # Upgrade rust older than this.
-MODERN_RUST_VERSION = LooseVersion('1.39.0')
+MODERN_RUST_VERSION = LooseVersion('1.37.0')
 
 # Upgrade nasm older than this.
 MODERN_NASM_VERSION = LooseVersion('2.14')
 
 
 class BaseBootstrapper(object):
     """Base class for system bootstrappers."""
 
--- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
+++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
@@ -1665,44 +1665,28 @@ def gen_invoke_rustc(version, rustup_wra
                     'i686-wrs-vxworks',
                     'powerpc-wrs-vxworks',
                     'powerpc-wrs-vxworks-spe',
                     'powerpc64-wrs-vxworks',
                     'riscv32i-unknown-none-elf',
                     'x86_64-uwp-windows-gnu',
                     'x86_64-wrs-vxworks',
                 ]
-            # Additional targets from 1.38
-            if Version(version) >= '1.39.0':
-                rust_targets += [
-                    'aarch64-uwp-windows-msvc',
-                    'armv7-wrs-vxworks-eabihf',
-                    'i686-unknown-uefi',
-                    'i686-uwp-windows-msvc',
-                    'mips64-unknown-linux-muslabi64',
-                    'mips64el-unknown-linux-muslabi64',
-                    'sparc64-unknown-openbsd',
-                    'x86_64-linux-kernel',
-                    'x86_64-uwp-windows-msvc',
-                ]
-                rust_targets.remove('armv7-wrs-vxworks')
-                rust_targets.remove('i586-wrs-vxworks')
-
             return 0, '\n'.join(sorted(rust_targets)), ''
         if (len(args) == 6 and args[:2] == ('--crate-type', 'staticlib') and
             args[2].startswith('--target=') and args[3] == '-o'):
             with open(args[4], 'w') as fh:
                 fh.write('foo')
             return 0, '', ''
         raise NotImplementedError('unsupported arguments')
     return invoke_rustc
 
 
 class RustTest(BaseConfigureTest):
-    def get_rust_target(self, target, compiler_type='gcc', version='1.39.0',
+    def get_rust_target(self, target, compiler_type='gcc', version='1.38.0',
                         arm_target=None):
         environ = {
             'PATH': os.pathsep.join(
                 mozpath.abspath(p) for p in ('/bin', '/usr/bin')),
         }
 
         paths = {
             mozpath.abspath('/usr/bin/cargo'): gen_invoke_cargo(version),
@@ -1776,17 +1760,16 @@ class RustTest(BaseConfigureTest):
             ('i686-pc-mingw32', 'cl', 'i686-pc-windows-msvc'),
             ('x86_64-pc-mingw32', 'cl', 'x86_64-pc-windows-msvc'),
             ('i686-pc-mingw32', 'gcc', 'i686-pc-windows-gnu'),
             ('x86_64-pc-mingw32', 'gcc', 'x86_64-pc-windows-gnu'),
             ('i686-pc-mingw32', 'clang', 'i686-pc-windows-gnu'),
             ('x86_64-pc-mingw32', 'clang', 'x86_64-pc-windows-gnu'),
             ('i686-w64-mingw32', 'clang', 'i686-pc-windows-gnu'),
             ('x86_64-w64-mingw32', 'clang', 'x86_64-pc-windows-gnu'),
-            ('aarch64-windows-mingw32', 'clang-cl', 'aarch64-pc-windows-msvc'),
         ):
             self.assertEqual(self.get_rust_target(autoconf, building_with_gcc), rust)
 
         # Arm special cases
         self.assertEqual(
             self.get_rust_target('arm-unknown-linux-androideabi',
                                  arm_target=ReadOnlyNamespace(
                                      arm_arch=7, fpu='neon', thumb2=True, float_abi='softfp')),
--- a/taskcluster/ci/toolchain/dist-toolchains.yml
+++ b/taskcluster/ci/toolchain/dist-toolchains.yml
@@ -30,10 +30,10 @@ rustc-dist-toolchain:
         symbol: TL(rustc-dist)
     worker:
         max-run-time: 1800
     run:
         arguments: ['rustc']
         toolchain-artifact: public/build/rustc-dist-toolchain.tar.xz
     fetches:
         toolchain:
-            - linux64-rust-cross-1.39
+            - linux64-rust-cross-1.38
             - linux64-sccache
--- a/taskcluster/ci/toolchain/misc.yml
+++ b/taskcluster/ci/toolchain/misc.yml
@@ -184,17 +184,17 @@ wrench-deps:
         sparse-profile: null  # need all of gfx/wr checked out for this script
         resources:
             - 'gfx/wr/Cargo.lock'
         toolchain-artifact: public/build/wrench-deps.tar.bz2
     fetches:
         fetch:
             - android-rs-glue
         toolchain:
-            - linux64-rust-1.39  # whatever m-c is built with
+            - linux64-rust-1.37  # whatever m-c is built with
 
 lucetc:
     description: "lucetc build process"
     treeherder:
         symbol: TL(lucetc)
     run:
         script: build-lucetc.sh
         toolchain-artifact: public/build/lucetc.tar.xz
--- a/taskcluster/ci/toolchain/rust.yml
+++ b/taskcluster/ci/toolchain/rust.yml
@@ -90,37 +90,25 @@ linux64-rust-1.37:
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'i686-unknown-linux-gnu',
             '--target', 'aarch64-unknown-linux-gnu',
         ]
 
 linux64-rust-1.38:
     treeherder:
-        symbol: TL(rust-1.38.0)
+        symbol: TL(rust)
     run:
         arguments: [
             '--channel', '1.38.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'i686-unknown-linux-gnu',
             '--target', 'aarch64-unknown-linux-gnu',
         ]
-
-linux64-rust-1.39:
-    treeherder:
-        symbol: TL(rust)
-    run:
-        arguments: [
-            '--channel', '1.39.0',
-            '--host', 'x86_64-unknown-linux-gnu',
-            '--target', 'x86_64-unknown-linux-gnu',
-            '--target', 'i686-unknown-linux-gnu',
-            '--target', 'aarch64-unknown-linux-gnu',
-        ]
         toolchain-alias: linux64-rust
 
 linux64-rust-nightly:
     description: "rust nightly repack"
     treeherder:
         symbol: TL(rust-nightly)
     run:
         arguments: [
@@ -173,23 +161,23 @@ linux64-rust-macos-1.35:
     run:
         arguments: [
             '--channel', '1.35.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-apple-darwin',
         ]
 
-linux64-rust-cross-1.39:
+linux64-rust-cross-1.38:
     description: "rust repack with macos and windows cross support"
     treeherder:
         symbol: TL(rust-cross)
     run:
         arguments: [
-            '--channel', '1.39.0',
+            '--channel', '1.38.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-apple-darwin',
             '--target', 'x86_64-pc-windows-msvc',
             '--target', 'i686-pc-windows-msvc',
             '--target', 'aarch64-pc-windows-msvc',
         ]
 
@@ -215,36 +203,24 @@ linux64-rust-macos-1.37:
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-apple-darwin',
         ]
 
 linux64-rust-macos-1.38:
     description: "rust repack with macos-cross support"
     treeherder:
-        symbol: TL(rust-macos-1.38)
+        symbol: TL(rust-macos)
     run:
         arguments: [
             '--channel', '1.38.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-apple-darwin',
         ]
-
-linux64-rust-macos-1.39:
-    description: "rust repack with macos-cross support"
-    treeherder:
-        symbol: TL(rust-macos)
-    run:
-        arguments: [
-            '--channel', '1.39.0',
-            '--host', 'x86_64-unknown-linux-gnu',
-            '--target', 'x86_64-unknown-linux-gnu',
-            '--target', 'x86_64-apple-darwin',
-        ]
         toolchain-alias: linux64-rust-macos
 
 linux64-rust-android-1.37:
     description: "rust repack with android-cross support"
     treeherder:
         symbol: TL(rust-android-1.37)
     run:
         arguments: [
@@ -256,44 +232,28 @@ linux64-rust-android-1.37:
             '--target', 'aarch64-linux-android',
             '--target', 'i686-linux-android',
             '--target', 'x86_64-linux-android',
         ]
 
 linux64-rust-android-1.38:
     description: "rust repack with android-cross support"
     treeherder:
-        symbol: TL(rust-android-1.38)
+        symbol: TL(rust-android)
     run:
         arguments: [
             '--channel', '1.38.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'armv7-linux-androideabi',
             '--target', 'thumbv7neon-linux-androideabi',
             '--target', 'aarch64-linux-android',
             '--target', 'i686-linux-android',
             '--target', 'x86_64-linux-android',
         ]
-
-linux64-rust-android-1.39:
-    description: "rust repack with android-cross support"
-    treeherder:
-        symbol: TL(rust-android)
-    run:
-        arguments: [
-            '--channel', '1.39.0',
-            '--host', 'x86_64-unknown-linux-gnu',
-            '--target', 'x86_64-unknown-linux-gnu',
-            '--target', 'armv7-linux-androideabi',
-            '--target', 'thumbv7neon-linux-androideabi',
-            '--target', 'aarch64-linux-android',
-            '--target', 'i686-linux-android',
-            '--target', 'x86_64-linux-android',
-        ]
         toolchain-alias: linux64-rust-android
 
 linux64-rust-windows-1.37:
     description: "rust repack with windows-cross support"
     treeherder:
         symbol: TL(rust-win-1.37)
     run:
         arguments: [
@@ -302,38 +262,25 @@ linux64-rust-windows-1.37:
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-pc-windows-msvc',
             '--target', 'i686-pc-windows-msvc',
         ]
 
 linux64-rust-windows-1.38:
     description: "rust repack with windows-cross support"
     treeherder:
-        symbol: TL(rust-win-1.38)
+        symbol: TL(rust-win)
     run:
         arguments: [
             '--channel', '1.38.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-pc-windows-msvc',
             '--target', 'i686-pc-windows-msvc',
         ]
-
-linux64-rust-windows-1.39:
-    description: "rust repack with windows-cross support"
-    treeherder:
-        symbol: TL(rust-win)
-    run:
-        arguments: [
-            '--channel', '1.39.0',
-            '--host', 'x86_64-unknown-linux-gnu',
-            '--target', 'x86_64-unknown-linux-gnu',
-            '--target', 'x86_64-pc-windows-msvc',
-            '--target', 'i686-pc-windows-msvc',
-        ]
         toolchain-alias: linux64-rust-windows
 
 win64-rust-1.28:
     treeherder:
         symbol: TW64(rust-1.28)
     run:
         arguments: [
             '--channel', '1.28.0',
@@ -363,37 +310,25 @@ win64-rust-1.37:
             '--host', 'x86_64-pc-windows-msvc',
             '--target', 'x86_64-pc-windows-msvc',
             '--target', 'i686-pc-windows-msvc',
             '--target', 'aarch64-pc-windows-msvc',
         ]
 
 win64-rust-1.38:
     treeherder:
-        symbol: TW64(rust-1.38)
+        symbol: TW64(rust)
     run:
         arguments: [
             '--channel', '1.38.0',
             '--host', 'x86_64-pc-windows-msvc',
             '--target', 'x86_64-pc-windows-msvc',
             '--target', 'i686-pc-windows-msvc',
             '--target', 'aarch64-pc-windows-msvc',
         ]
-
-win64-rust-1.39:
-    treeherder:
-        symbol: TW64(rust)
-    run:
-        arguments: [
-            '--channel', '1.39.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
 
 mingw32-rust-1.31:
     treeherder:
         symbol: TMW(rust-1.31)
     run:
         arguments: [
             '--channel', '1.31.0',
@@ -414,32 +349,19 @@ mingw32-rust-1.37:
             '--target', 'i686-unknown-linux-gnu',
             '--target', 'i686-pc-windows-gnu',
             '--target', 'x86_64-pc-windows-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
         ]
 
 mingw32-rust-1.38:
     treeherder:
-        symbol: TMW(rust-1.38)
+        symbol: TMW(rust)
     run:
         arguments: [
             '--channel', '1.38.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'i686-unknown-linux-gnu',
             '--target', 'i686-pc-windows-gnu',
             '--target', 'x86_64-pc-windows-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
         ]
-
-mingw32-rust-1.39:
-    treeherder:
-        symbol: TMW(rust)
-    run:
-        arguments: [
-            '--channel', '1.39.0',
-            '--host', 'x86_64-unknown-linux-gnu',
-            '--target', 'i686-unknown-linux-gnu',
-            '--target', 'i686-pc-windows-gnu',
-            '--target', 'x86_64-pc-windows-gnu',
-            '--target', 'x86_64-unknown-linux-gnu',
-        ]
         toolchain-alias: mingw32-rust