Backed out changeset 588a1949ec96 (bug 1545968) as per kats request. CLOSED TREE
authorNarcis Beleuzu <nbeleuzu@mozilla.com>
Tue, 07 May 2019 18:28:48 +0300
changeset 534790 50f2bf78b087afcb2ad78e1f6d176326121c2f3d
parent 534789 0e0001b3de603326137d39ab63cae656638ad2dc
child 534791 90cb2313723f7106ae2521ff42c14a631d65b62f
push id2082
push userffxbld-merge
push dateMon, 01 Jul 2019 08:34:18 +0000
treeherdermozilla-release@2fb19d0466d2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1545968
milestone68.0a1
backs out588a1949ec96b2ad35bbb97db08de10bfa609944
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 changeset 588a1949ec96 (bug 1545968) as per kats request. CLOSED TREE
taskcluster/scripts/misc/repack_rust.py
--- a/taskcluster/scripts/misc/repack_rust.py
+++ b/taskcluster/scripts/misc/repack_rust.py
@@ -200,17 +200,17 @@ def install(filename, target):
     log('Cleaning %s...' % basename)
     shutil.rmtree(basename)
 
 
 def package(manifest, pkg, target):
     '''Pull out the package dict for a particular package and target
     from the given manifest.'''
     version = manifest['pkg'][pkg]['version']
-    info = manifest['pkg'][pkg]['target'].get(target, '*')
+    info = manifest['pkg'][pkg]['target'][target]
     return (version, info)
 
 
 def fetch_package(manifest, pkg, host):
     version, info = package(manifest, pkg, host)
     log('%s %s\n  %s\n  %s' % (pkg, version, info['url'], info['hash']))
     if not info['available']:
         log('%s marked unavailable for %s' % (pkg, host))
@@ -221,18 +221,18 @@ def fetch_package(manifest, pkg, host):
             '\n  %s' % sha)
         raise AssertionError
     return info
 
 
 def fetch_std(manifest, targets):
     stds = []
     for target in targets:
-        stds.append(fetch_package(manifest, 'rust-std', target))
-        stds.append(fetch_package(manifest, 'rust-analysis', target))
+        info = fetch_package(manifest, 'rust-std', target)
+        stds.append(info)
     return stds
 
 
 def fetch_optional(manifest, pkg, host):
     try:
         return fetch_package(manifest, pkg, host)
     except KeyError:
         # The package is not available, oh well!
@@ -273,30 +273,28 @@ def repack(host, targets, channel='stabl
         cargo_manifest = fetch_manifest(cargo_channel)
         log('Using manifest for cargo %s as of %s.' %
             (cargo_channel, cargo_manifest['date']))
 
     log('Fetching packages...')
     rustc = fetch_package(manifest, 'rustc', host)
     cargo = fetch_package(cargo_manifest, 'cargo', host)
     stds = fetch_std(manifest, targets)
-    rustsrc = fetch_package(manifest, 'rust-src', host)
     rustfmt = fetch_optional(manifest, 'rustfmt-preview', host)
 
     log('Installing packages...')
     install_dir = 'rustc'
     # Clear any previous install directory.
     try:
         shutil.rmtree(install_dir)
     except OSError as e:
         if e.errno != errno.ENOENT:
             raise
     install(os.path.basename(rustc['url']), install_dir)
     install(os.path.basename(cargo['url']), install_dir)
-    install(os.path.basename(rustsrc['url']), install_dir)
     if rustfmt:
         install(os.path.basename(rustfmt['url']), install_dir)
     for std in stds:
         install(os.path.basename(std['url']), install_dir)
         pass
 
     log('Creating archive...')
     tar_options, tar_ext = tar_for_host(host)