Bug 1371372 - Remove cargo tarball naming work-around. r=mshal
authorRalph Giles <giles@mozilla.com>
Thu, 08 Jun 2017 11:48:55 -0700
changeset 411182 0e44ba584daf4aed13eaf6e919160ab5e448562e
parent 411181 85a4e9d8310beb91494865dd8f4a0391222aeee9
child 411183 7035543349b631b27540f2b82c974544328e93f1
push id7391
push usermtabara@mozilla.com
push dateMon, 12 Jun 2017 13:08:53 +0000
treeherdermozilla-beta@2191d7f87e2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1371372
milestone55.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 1371372 - Remove cargo tarball naming work-around. r=mshal This is no longer necessary with the 1.18.0 release. MozReview-Commit-ID: 1IGQFuvRIzu
taskcluster/docker/rust-build/VERSION
taskcluster/docker/rust-build/repack_rust.py
--- a/taskcluster/docker/rust-build/VERSION
+++ b/taskcluster/docker/rust-build/VERSION
@@ -1,1 +1,1 @@
-0.4.5
+0.4.6
--- a/taskcluster/docker/rust-build/repack_rust.py
+++ b/taskcluster/docker/rust-build/repack_rust.py
@@ -2,17 +2,16 @@
 '''
 This script downloads and repacks official rust language builds
 with the necessary tool and target support for the Firefox
 build environment.
 '''
 
 import argparse
 import os.path
-import re
 import sys
 
 import requests
 import subprocess
 import toml
 
 
 def log(msg):
@@ -56,18 +55,16 @@ def fetch(url):
         ])
 
 
 def install(filename, target):
     '''Run a package's installer script against the given target directory.'''
     log('Unpacking %s...' % filename)
     subprocess.check_call(['tar', 'xf', filename])
     basename = filename.split('.tar')[0]
-    # Work around bad tarball naming in 1.15+ cargo packages.
-    basename = re.sub(r'cargo-0\.[\d\.]+', 'cargo-nightly', basename)
     log('Installing %s...' % basename)
     install_cmd = [os.path.join(basename, 'install.sh')]
     install_cmd += ['--prefix=' + os.path.abspath(target)]
     install_cmd += ['--disable-ldconfig']
     subprocess.check_call(install_cmd)
     log('Cleaning %s...' % basename)
     subprocess.check_call(['rm', '-rf', basename])