build_pull_requests now moves the artifacts to the parent folder: thi…

…s allows calling "clean" target before each build
heman4t · Feb 2, 2015 · d61568a · d61568a
1 parent f7bc69a
commit d61568a
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/build/build_pull_request.bash b/build/build_pull_request.bash
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/bin/bash -ex
 
 if [ "x${ghprbPullId}" == "x" ]
 then
@@ -15,8 +15,15 @@ fi
 
 VERSION="PR-${ghprbPullId}-BUILD-${BUILD_NUMBER}"
 
-ant -Djava.net.preferIPv4Stack=true -Dplatform=linux32 -Dlinux32=1 -Dversion="${VERSION}" dist
-ant -Djava.net.preferIPv4Stack=true -Dplatform=linux64 -Dlinux64=1 -Dversion="${VERSION}" dist
-ant -Djava.net.preferIPv4Stack=true -Dplatform=windows -Dwindows=1 -Dversion="${VERSION}" dist
-ant -Djava.net.preferIPv4Stack=true -Dplatform=macosx  -Dmacosx=1  -Dversion="${VERSION}" dist
+ant -Djava.net.preferIPv4Stack=true -Dplatform=linux32 -Dversion="${VERSION}" clean dist
+mv linux/arduino-*$VERSION*.tar.xz ../
+
+ant -Djava.net.preferIPv4Stack=true -Dplatform=linux64 -Dversion="${VERSION}" clean dist
+mv linux/arduino-*$VERSION*.tar.xz ../
+
+ant -Djava.net.preferIPv4Stack=true -Dplatform=windows -Dversion="${VERSION}" clean dist
+mv windows/arduino-*$VERSION*.zip ../
+
+ant -Djava.net.preferIPv4Stack=true -Dplatform=macosx -Dversion="${VERSION}" clean dist
+mv macosx/arduino-*$VERSION*.zip ../