X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=util%2Ftravis_compiled_push.sh;h=58334cb1f687c73b072fc07773929afbed6cb5cb;hb=216f669276b30393fb35a409011ccdad8b521156;hp=b70999c72ffa6d9fe5512212ba8d498ea583f974;hpb=ee386a29d1a8b46f16c5c139db74624f829d9a53;p=qmk_firmware.git

diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index b70999c72..58334cb1f 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 ()
 {
@@ -20,7 +20,8 @@ increment_version ()
 NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | wc -l)
 if [[ $NEFM -gt 0 ]] ; then
 	echo "Essential files modified."
-	lasttag=$(git tag | grep -Ev '\-' | head -1)
+	git fetch --tags
+	lasttag=$(git tag | grep -Ev '\-' | xargs -I@ git log --format=format:"%ai @%n" -1 @ | sort -V | awk '{print $4}' | tail -1)
 	newtag=$(increment_version $lasttag)
 	git tag $newtag
 	git push --tags -q https://$GH_TOKEN@github.com/qmk/qmk_firmware
@@ -37,10 +38,10 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
 	git clone https://$GH_TOKEN@github.com/jackhumbert/qmk.fm.git
 	cd qmk.fm
 	git submodule update --init --recursive
-	rm -rf keyboard
-	rm -rf keyboards
-	cp -r ../qmk_firmware/keyboards .
-	mkdir keyboards/ergodox_ez/
+	#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