fix travis and reduce warnings

[qmk_firmware.git] / util / travis_compiled_push.sh

diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index 8025ccb8fe6fc077d419ee0400254b7445cce6f3..58334cb1f687c73b072fc07773929afbed6cb5cb 100644 (file)
--- 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 ()
 {
@@ -21,7 +21,7 @@ NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/
 if [[ $NEFM -gt 0 ]] ; then
        echo "Essential files modified."
        git fetch --tags
-       lasttag=$(git tag | grep -Ev '\-' | xargs -I@ git log --format=format:"%ai @%n" -1 @ | sort | awk '{print $4}' | tail -1)
+       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
@@ -38,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