1 files changed, 6 insertions, 5 deletions

diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index b70999c72..de2481ce5 100644
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@@ -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