X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=util%2Ftravis_compiled_push.sh;h=27e77a92187cb8e690162e39cdb3c4fb7aa4044e;hb=91683d56fa5c9cf9893219b3dac269e20a2c7251;hp=abfec4ecd2c019a2c74f07633716942f8c3d81a1;hpb=437c86c9c1b81ecbb4470830d456d440a8c63507;p=qmk_firmware.git

diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index abfec4ecd..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."
@@ -56,7 +57,8 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
 	eval `ssh-agent -s`
 	ssh-add id_rsa_qmk.fm
 	
-	rm -f compiled/*.hex
+	# 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