From cd2ec725c8b3aa26ed0df2a481135dadd24b6cce Mon Sep 17 00:00:00 2001 From: Ralph Giles Date: Thu, 2 Feb 2017 11:02:41 -0800 Subject: [PATCH] Bug 1336155 - Update rust repack script for 1.15.0 stable. r=mshal Revert the bump to beta for the android builders now that 1.15.0 is in stable release. Generalize the cargo tarball name mangling to use a regular expression to hand the tiny revision added for the stable release, as suggested by mshal in bug 1332759. MozReview-Commit-ID: 2xZWpvKxY77 --HG-- extra : rebase_source : 40121cae1868d4870a5aa05e3514a75891c3d77c --- taskcluster/docker/rust-build/repack_rust.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/taskcluster/docker/rust-build/repack_rust.py b/taskcluster/docker/rust-build/repack_rust.py index 6dfaed8f4754..58b0c4285c07 100644 --- a/taskcluster/docker/rust-build/repack_rust.py +++ b/taskcluster/docker/rust-build/repack_rust.py @@ -6,6 +6,7 @@ build environment. ''' import os.path +import re import sys import requests @@ -59,7 +60,7 @@ def install(filename, target): basename = filename.split('.tar')[0] # Work around bad tarball naming in 1.15 cargo packages. basename = basename.replace('cargo-beta', 'cargo-nightly') - basename = basename.replace('cargo-0.16', 'cargo-nightly') + basename = re.sub(r'cargo-0\.[\d\.]+', 'cargo-nightly', basename) print(' Installing %s...' % basename) install_cmd = [os.path.join(basename, 'install.sh')] install_cmd += ['--prefix=' + os.path.abspath(target)] @@ -198,4 +199,4 @@ if __name__ == '__main__': repack(win64, [win64]) repack(linux64, [linux64, linux32]) repack(linux64, [linux64, mac64, mac32], suffix='mac-cross') - repack(linux64, [linux64, android, android_x86], channel='beta', suffix='android-cross') + repack(linux64, [linux64, android, android_x86], suffix='android-cross')