Bug 1356683 - Use new tooltool wrapper in Linux and OSX clang toolchain builds. r?chmanchester draft
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 12 Apr 2017 17:59:21 +0900
changeset 563044 0feb06c8cd6f3624eaeada12b2750d669b308809
parent 563043 991567aa5319fb2051af9d64af6494bd1d4b4bcd
child 563045 cabc0fedf86d2b4a6700ae2ece5d63cab6fa8169
push id54195
push userbmo:mh+mozilla@glandium.org
push dateFri, 14 Apr 2017 21:59:19 +0000
reviewerschmanchester
bugs1356683
milestone55.0a1
Bug 1356683 - Use new tooltool wrapper in Linux and OSX clang toolchain builds. r?chmanchester While here, ensure those toolchain builds are triggered when the helper script is modified.
taskcluster/ci/toolchain/linux.yml
taskcluster/ci/toolchain/macosx.yml
taskcluster/scripts/misc/tooltool-download.sh
--- a/taskcluster/ci/toolchain/linux.yml
+++ b/taskcluster/ci/toolchain/linux.yml
@@ -15,16 +15,17 @@ linux64-clang/opt:
         docker-image: {in-tree: desktop-build}
         max-run-time: 36000
     run:
         using: toolchain-script
         script: build-clang-linux.sh
         tooltool-downloads: public
         resources:
             - 'build/build-clang/**'
+            - 'taskcluster/scripts/misc/tooltool-download.sh'
 
 linux64-clang-tidy/opt:
     description: "Clang-tidy build"
     index:
         product: static-analysis
         job-name: linux64-clang-tidy
     treeherder:
         kind: build
@@ -38,16 +39,17 @@ linux64-clang-tidy/opt:
         max-run-time: 36000
     run:
         using: toolchain-script
         script: build-clang-tidy-linux.sh
         tooltool-downloads: public
         resources:
             - 'build/clang-plugin/**'
             - 'build/build-clang/**'
+            - 'taskcluster/scripts/misc/tooltool-download.sh'
 
 linux64-gcc/opt:
     description: "GCC toolchain build"
     treeherder:
         kind: build
         platform: toolchains/opt
         symbol: TL(gcc)
         tier: 1
@@ -109,16 +111,17 @@ linux64-hfsplus/opt:
         docker-image: {in-tree: desktop-build}
         max-run-time: 36000
     run:
         using: toolchain-script
         script: build-hfsplus-linux.sh
         tooltool-downloads: public
         resources:
             - 'build/unix/build-hfsplus/**'
+            - 'taskcluster/scripts/misc/tooltool-download.sh'
 
 linux64-libdmg/opt:
     description: "libdmg-hfsplus toolchain build"
     treeherder:
         kind: build
         platform: toolchains/opt
         symbol: TL(libdmg-hfs+)
         tier: 1
--- a/taskcluster/ci/toolchain/macosx.yml
+++ b/taskcluster/ci/toolchain/macosx.yml
@@ -15,16 +15,17 @@ macosx64-clang/opt:
         docker-image: {in-tree: desktop-build}
         max-run-time: 36000
     run:
         using: toolchain-script
         script: build-clang-macosx.sh
         tooltool-downloads: internal
         resources:
             - 'build/build-clang/**'
+            - 'taskcluster/scripts/misc/tooltool-download.sh'
 
 macosx64-clang-tidy/opt:
     description: "Clang-tidy build"
     index:
         product: static-analysis
         job-name: macosx64-clang-tidy
     treeherder:
         kind: build
@@ -38,16 +39,17 @@ macosx64-clang-tidy/opt:
         max-run-time: 36000
     run:
         using: toolchain-script
         script: build-clang-tidy-macosx.sh
         tooltool-downloads: internal
         resources:
             - 'build/clang-plugin/**'
             - 'build/build-clang/**'
+            - 'taskcluster/scripts/misc/tooltool-download.sh'
 
 macosx64-cctools-port/opt:
     description: "cctools-port toolchain build"
     treeherder:
         kind: build
         platform: toolchains/opt
         symbol: TM(cctools)
         tier: 1
--- a/taskcluster/scripts/misc/tooltool-download.sh
+++ b/taskcluster/scripts/misc/tooltool-download.sh
@@ -1,11 +1,10 @@
 # Fetch a tooltool manifest.
 
 cd $HOME/workspace/build/src
 
-chmod +x python/mozbuild/mozbuild/action/tooltool.py
 : TOOLTOOL_CACHE                ${TOOLTOOL_CACHE:=/home/worker/tooltool-cache}
 export TOOLTOOL_CACHE
 
-./python/mozbuild/mozbuild/action/tooltool.py --url=http://relengapi/tooltool/ -m "${TOOLTOOL_MANIFEST}" fetch
+./mach artifact toolchain -v --tooltool-url=http://relengapi/tooltool/ --tooltool-manifest "${TOOLTOOL_MANIFEST}"
 
 cd $OLDPWD