Bug 1355731 - 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 562520 4a0878d1310107f8cde0fffb41a77b4b13aeb944
parent 562519 a9e8fb7c09b1c3462286ba6742b1af3c653342b0
child 562521 a5bb0984c17eadf217f5805092ecbdeef06d5d68
push id54045
push userbmo:mh+mozilla@glandium.org
push dateFri, 14 Apr 2017 02:38:10 +0000
reviewerschmanchester
bugs1355731
milestone55.0a1
Bug 1355731 - 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