X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=util%2Ftravis_compiled_push.sh;h=27e77a92187cb8e690162e39cdb3c4fb7aa4044e;hb=bc98b0d9eb5eb1a4df140ab6e2158904e5e100e5;hp=c2528168a7d1691ab6a2c242c5833a376680aad9;hpb=51a2ce61456826a57e9ef676a6c330efec2da64b;p=qmk_firmware.git

diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index c2528168a..27e77a921 100644
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@@ -40,7 +40,8 @@ if [[ $NEFM -gt 0 ]] ; then
 	#lasttag=$(git describe --tags $(git rev-list --tags --max-count=10) | grep -Ev '\-' | xargs -I@ git log --format=format:"%ai @%n" -1 @ | sort -V | awk '{print $4}' | tail -1)
 	lasttag=$(git describe --tags $(git rev-list --tags --max-count=10) | grep -Ev '\-' | sort -V | tail -1)
 	newtag=$(increment_version $lasttag)
-	git tag $newtag
+	newertag=$(increment_version $newtag)
+	git tag $newtag || git tag $newertag
 	git push --tags git@github.com:qmk/qmk_firmware.git
 else
 	echo "No essential files modified."
@@ -55,17 +56,13 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
 	ssh-add -D
 	eval `ssh-agent -s`
 	ssh-add id_rsa_qmk.fm
-	#git submodule update --init --recursive
-	#rm -rf keyboard
-	#rm -rf 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
-	rm -f _compiled/*.hex
-	for file in ../qmk_firmware/keyboards/*/keymaps/*/*.hex; do mv -v "$file" "_compiled/${file##*/}"; done
-	for file in ../qmk_firmware/keyboards/*/*/keymaps/*/*.hex; do mv -v "$file" "_compiled/${file##*/}"; done
+	
+	# not sure this is needed now
+	# rm -f compiled/*.hex
+
+	# ignore errors here
+	for file in ../qmk_firmware/keyboards/*/keymaps/*/*.hex; do mv -v "$file" "compiled/${file##*/}" || true; done
+	for file in ../qmk_firmware/keyboards/*/*/keymaps/*/*.hex; do mv -v "$file" "compiled/${file##*/}" || true; done
 
 	git add -A
 	git commit -m "generated from qmk/qmk_firmware@${rev}"