Bug 1546870 - Package win*-rust toolchains as .tar.xz. r=froydnj
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 25 Apr 2019 13:22:38 +0000
changeset 530493 8c3a37a0a53e8a2b99473cb8bb44201165b402be
parent 530492 deb76e88424bd4e39b1fd949bec3233ea3e505bd
child 530494 adbd46962f21820f20a236c66fe1f3bdb57e52b4
push id11265
push userffxbld-merge
push dateMon, 13 May 2019 10:53:39 +0000
treeherdermozilla-beta@77e0fe8dbdd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1546870
milestone68.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 1546870 - Package win*-rust toolchains as .tar.xz. r=froydnj This uniformizes the artifact name across platforms. We may want to do the same for other toolchains, but it bears the question whether xz is reliably available on users' Windows machines, while it doesn't matter for rust, since mach bootstrap pulls it with rustup rather than from automation, contrary to other toolchains. Differential Revision: https://phabricator.services.mozilla.com/D28780
taskcluster/ci/toolchain/rust.yml
taskcluster/scripts/misc/repack_rust.py
--- a/taskcluster/ci/toolchain/rust.yml
+++ b/taskcluster/ci/toolchain/rust.yml
@@ -143,44 +143,41 @@ win64-rust-1.28:
         symbol: TW64(rust-1.28)
     run:
         arguments: [
             '--channel', '1.28.0',
             '--host', 'x86_64-pc-windows-msvc',
             '--target', 'x86_64-pc-windows-msvc',
             '--target', 'i686-pc-windows-msvc',
         ]
-        toolchain-artifact: public/build/rustc.tar.bz2
 
 win64-rust-1.34:
     treeherder:
         symbol: TW64(rust)
     run:
         arguments: [
             '--channel', '1.34.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
-        toolchain-artifact: public/build/rustc.tar.bz2
 
 win64-rust-nightly:
     description: "rust nightly repack"
     treeherder:
         symbol: TW64(rust-nightly)
     run:
         arguments: [
             '--channel', 'nightly-2018-12-14',
             '--host', 'x86_64-pc-windows-msvc',
             '--target', 'x86_64-pc-windows-msvc',
             '--target', 'i686-pc-windows-msvc',
         ]
-        toolchain-artifact: public/build/rustc.tar.bz2
 
 mingw32-rust-1.31:
     treeherder:
         symbol: TMW(rust-1.31)
     run:
         arguments: [
             '--channel', '1.31.0',
             '--host', 'x86_64-unknown-linux-gnu',
--- a/taskcluster/scripts/misc/repack_rust.py
+++ b/taskcluster/scripts/misc/repack_rust.py
@@ -235,22 +235,18 @@ def fetch_optional(manifest, pkg, host):
     try:
         return fetch_package(manifest, pkg, host)
     except KeyError:
         # The package is not available, oh well!
         return None
 
 
 def tar_for_host(host):
-    if 'linux' in host:
-        tar_options = 'cJf'
-        tar_ext = '.tar.xz'
-    else:
-        tar_options = 'cjf'
-        tar_ext = '.tar.bz2'
+    tar_options = 'cJf'
+    tar_ext = '.tar.xz'
     return tar_options, tar_ext
 
 
 def fetch_manifest(channel='stable'):
     if '-' in channel:
         channel, date = channel.split('-', 1)
         prefix = '/' + date
     else: