Bug 1356683 - Use new tooltool wrapper in Linux hazard builds. r?chmanchester draft
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 12 Apr 2017 17:51:01 +0900
changeset 574592 f45daaf2cbecee22dce408865947a93c59a7e74e
parent 574591 d9910c3a8e771a1a60c15a371069e90974b0ab83
child 574593 851e7ad2acab3b0b50d4e0b3bf4f0e03a2287094
push id57765
push userbmo:mh+mozilla@glandium.org
push dateTue, 09 May 2017 05:03:29 +0000
reviewerschmanchester
bugs1356683
milestone55.0a1
Bug 1356683 - Use new tooltool wrapper in Linux hazard builds. r?chmanchester
taskcluster/scripts/builder/build-haz-linux.sh
--- a/taskcluster/scripts/builder/build-haz-linux.sh
+++ b/taskcluster/scripts/builder/build-haz-linux.sh
@@ -49,17 +49,17 @@ GECKO_DIR=$( cd "$GECKO_DIR" && pwd )
 # Directory to populate with tooltool-installed tools
 export TOOLTOOL_DIR="$WORKSPACE"
 
 # Directory to hold the (useless) object files generated by the analysis.
 export MOZ_OBJDIR="$WORKSPACE/obj-analyzed"
 mkdir -p "$MOZ_OBJDIR"
 
 if [ -n "$DO_TOOLTOOL" ]; then
-  ( cd $TOOLTOOL_DIR; python $GECKO_DIR/python/mozbuild/mozbuild/action/tooltool.py --url https://api.pub.build.mozilla.org/tooltool/ -m $GECKO_DIR/$TOOLTOOL_MANIFEST fetch -c $TOOLTOOL_CACHE )
+  ( cd $TOOLTOOL_DIR; $GECKO_DIR/mach artifact toolchain -v --tooltool-url https://api.pub.build.mozilla.org/tooltool/ --tooltool-manifest $GECKO_DIR/$TOOLTOOL_MANIFEST --cache-dir $TOOLTOOL_CACHE )
 fi
 
 export NO_MERCURIAL_SETUP_CHECK=1
 
 if [[ "$PROJECT" = "browser" ]]; then (
     cd "$WORKSPACE"
     set "$WORKSPACE"
     . setup-ccache.sh