Followup for bug 1421100: deterministically download rustc 1.23.0-beta.2. r=me, a=bustage on a CLOSED TREE
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 04 Jan 2018 14:41:01 +0900
changeset 397678 5afa32a16a2f7ebbd8bf19e49efc50832110980d
parent 397677 841178c05781ac908585956088662ad5fa5608b9
child 397717 f78a83244fbebe8a469ae3512fce7f638cab7e1f
child 397843 1acc7e79c836e4979cd18dc3cc9ee262205ceb2d
push id98591
push usermh@glandium.org
push dateThu, 04 Jan 2018 05:52:45 +0000
treeherdermozilla-inbound@5afa32a16a2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme, bustage
bugs1421100
milestone59.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
Followup for bug 1421100: deterministically download rustc 1.23.0-beta.2. r=me, a=bustage on a CLOSED TREE
taskcluster/ci/toolchain/windows.yml
taskcluster/scripts/misc/repack_rust.py
--- a/taskcluster/ci/toolchain/windows.yml
+++ b/taskcluster/ci/toolchain/windows.yml
@@ -153,17 +153,17 @@ win32-rust-1.23.0-beta.2:
         docker-image: {in-tree: desktop-build}
         max-run-time: 7200
         env:
             UPLOAD_DIR: artifacts
     run:
         using: toolchain-script
         script: repack_rust.py
         arguments: [
-            '--channel', 'beta',
+            '--channel', 'beta-2017-12-08',
             '--host', 'i686-pc-windows-msvc',
             '--target', 'i686-pc-windows-msvc',
         ]
         toolchain-alias: win32-rust
         toolchain-artifact: public/build/rustc.tar.bz2
 
 mingw32-rust-1.22:
     description: "rust repack"
--- a/taskcluster/scripts/misc/repack_rust.py
+++ b/taskcluster/scripts/misc/repack_rust.py
@@ -237,17 +237,23 @@ def tar_for_host(host):
         tar_ext = '.tar.xz'
     else:
         tar_options = 'cjf'
         tar_ext = '.tar.bz2'
     return tar_options, tar_ext
 
 
 def fetch_manifest(channel='stable'):
-    url = 'https://static.rust-lang.org/dist/channel-rust-' + channel + '.toml'
+    if '-' in channel:
+        channel, date = channel.split('-', 1)
+        prefix = '/' + date
+    else:
+        prefix = ''
+    url = 'https://static.rust-lang.org/dist%s/channel-rust-%s.toml' % (
+        prefix, channel)
     req = requests.get(url)
     req.raise_for_status()
     manifest = toml.loads(req.content)
     if manifest['manifest-version'] != '2':
         raise NotImplementedError('Unrecognized manifest version %s.' %
                                   manifest['manifest-version'])
     return manifest