Bug 1438692 - Build sccache with rust 1.24. draft
authorRalph Giles <giles@mozilla.com>
Thu, 15 Feb 2018 15:02:08 -0800
changeset 755911 f5b014427ec0280a0116f369f196b09f1f1f4783
parent 755857 7dd11fef8ea01a315d4432d094225f468121ebe6
push id99319
push userbmo:giles@thaumas.net
push dateThu, 15 Feb 2018 23:12:32 +0000
bugs1438692
milestone60.0a1
Bug 1438692 - Build sccache with rust 1.24. Update sccache build description to use the latest stable rust toolchain. We didn't upgrade earlier because of problems on Windows. Note that we can't just depend on the stable rust toolchain alias, because the toolchain deps are resolved in a single pass. Instead, we use the current stable version explicitly. MozReview-Commit-ID: 4OVbFsYZZLZ
taskcluster/ci/toolchain/linux.yml
taskcluster/ci/toolchain/windows.yml
--- a/taskcluster/ci/toolchain/linux.yml
+++ b/taskcluster/ci/toolchain/linux.yml
@@ -424,39 +424,16 @@ linux64-rust-1.23:
         arguments: [
             '--channel', '1.23.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'i686-unknown-linux-gnu',
         ]
         toolchain-artifact: public/build/rustc.tar.xz
 
-linux64-rust-1.19:
-    description: "rust repack"
-    treeherder:
-        kind: build
-        platform: toolchains/opt
-        symbol: TL(rust-1.19)
-        tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
-    worker:
-        max-run-time: 7200
-        env:
-            UPLOAD_DIR: artifacts
-    run:
-        using: toolchain-script
-        script: repack_rust.py
-        arguments: [
-            '--channel', '1.19.0',
-            '--host', 'x86_64-unknown-linux-gnu',
-            '--target', 'x86_64-unknown-linux-gnu',
-            '--target', 'i686-unknown-linux-gnu',
-        ]
-        toolchain-artifact: public/build/rustc.tar.xz
-
 linux64-rust-macos-1.24:
     description: "rust repack with macos-cross support"
     treeherder:
         kind: build
         platform: toolchains/opt
         symbol: TL(rust-macos)
         tier: 1
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
@@ -514,17 +491,17 @@ linux64-sccache:
         max-run-time: 36000
     run:
         using: toolchain-script
         script: build-sccache.sh
         resources:
             - 'taskcluster/scripts/misc/tooltool-download.sh'
         toolchain-artifact: public/build/sccache2.tar.xz
     toolchains:
-        - linux64-rust-1.19
+        - linux64-rust-1.24
 
 linux64-gn:
     description: "gn toolchain build"
     treeherder:
         kind: build
         platform: toolchains/opt
         symbol: TL(gn)
         tier: 1
--- a/taskcluster/ci/toolchain/windows.yml
+++ b/taskcluster/ci/toolchain/windows.yml
@@ -117,39 +117,16 @@ win64-rust-1.24:
             '--channel', '1.24.0',
             '--host', 'x86_64-pc-windows-msvc',
             '--target', 'x86_64-pc-windows-msvc',
             '--target', 'i686-pc-windows-msvc',
         ]
         toolchain-alias: win64-rust
         toolchain-artifact: public/build/rustc.tar.bz2
 
-win64-rust-1.19:
-    description: "rust repack"
-    treeherder:
-        kind: build
-        platform: toolchains/opt
-        symbol: TW64(rust-1.19)
-        tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
-    worker:
-        docker-image: {in-tree: toolchain-build}
-        max-run-time: 7200
-        env:
-            UPLOAD_DIR: artifacts
-    run:
-        using: toolchain-script
-        script: repack_rust.py
-        arguments: [
-            '--channel', '1.19.0',
-            '--host', 'x86_64-pc-windows-msvc',
-            '--target', 'x86_64-pc-windows-msvc',
-        ]
-        toolchain-artifact: public/build/rustc.tar.bz2
-
 win32-rust-1.24:
     description: "rust repack"
     treeherder:
         kind: build
         platform: toolchains/opt
         symbol: TW32(rust)
         tier: 1
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
@@ -209,17 +186,17 @@ win64-sccache:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/sccache-build.manifest"
     run:
         using: toolchain-script
         script: build-sccache.sh
         resources:
             - 'taskcluster/scripts/misc/tooltool-download.sh'
         toolchain-artifact: public/build/sccache2.tar.bz2
     toolchains:
-        - win64-rust-1.19
+        - win64-rust-1.24
 
 win32-gn:
     description: "gn toolchain build"
     treeherder:
         kind: build
         platform: toolchains/opt
         symbol: TW32(gn)
         tier: 1