X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=util%2Ftravis_compiled_push.sh;h=718daaa295637ac8ebd65c623fd0ff3b44172c58;hb=c686793b596cd3e2977a4c76b976df31e18bdb5b;hp=de2481ce54625f3867c7882ec42005c03747ab5d;hpb=3c7fa0acc10305a573bc3bb29243a7a3d601579b;p=qmk_firmware.git

diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index de2481ce5..718daaa29 100644
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@@ -7,7 +7,7 @@ rev=$(git rev-parse --short HEAD)
 git config --global user.name "Travis CI"
 git config --global user.email "jack.humb+travis.ci@gmail.com"
 
-if [[ "$TRAVIS_BRANCH" == "master" ]] ; then
+if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then
 
 increment_version ()
 {
@@ -33,18 +33,19 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
 
 	make ergodox-ez AUTOGEN=true
 
-	find . -name ".build" | xargs rm -rf
 	cd ..
 	git clone https://$GH_TOKEN@github.com/jackhumbert/qmk.fm.git
 	cd qmk.fm
-	git submodule update --init --recursive
+	#git submodule update --init --recursive
 	#rm -rf keyboard
 	#rm -rf keyboards
-	yes | cp -rf ../qmk_firmware/keyboards .
+	#yes | cp -rf ../qmk_firmware/keyboards .
 	#mkdir keyboards/ergodox_ez/
-	cp ../qmk_firmware/util/ergodox_ez.html keyboards/ergodox_ez/index.html
-	cp ../qmk_firmware/readme.md qmk_readme.md
-	./generate.sh
+	#cp ../qmk_firmware/util/ergodox_ez.html keyboards/ergodox_ez/index.html
+	#cp ../qmk_firmware/readme.md qmk_readme.md
+	#./generate.sh
+	rm -f _compiled/*.hex
+	for file in ../qmk_firmware/keyboards/*/keymaps/*/*.hex; do mv -v "$file" "_compiled/${file##*/}"; done
 
 	git add -A
 	git commit -m "generated from qmk/qmk_firmware@${rev}"