Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1336155 - Update rust repack script for 1.15.0 stable. r=mshal

Browse Source 
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
This commit is contained in:
Ralph Giles 2017-02-02 11:02:41 -08:00
parent 1fb06abb92
commit cd2ec725c8
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
taskcluster/docker/rust-build/repack_rust.py
View File

@ -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')