Update default Viterbi layout

[qmk_firmware.git] / util / travis_compiled_push.sh

diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index 833fa8e46549d1401e13c284f3ab4923c29a3ec5..af9fc51d9c45ef382f270eb86cd670a6fa5982fe 100644 (file)
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@@ -18,10 +18,10 @@ eval `ssh-agent -s`
 ssh-add id_rsa_qmk_firmware
 
 # convert to unix line-endings
+git checkout master
 git diff --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 dos2unix
 git diff --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 git add
-git commit -m "convert to unix line-endings [skip ci]"
-git push git@github.com:qmk/qmk_firmware.git
+git commit -m "convert to unix line-endings [skip ci]" && git push git@github.com:qmk/qmk_firmware.git master
 
 increment_version ()
 {
@@ -55,17 +55,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}"