attempt to fix line-ending travis stuff

[qmk_firmware.git] / util / travis_compiled_push.sh

diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index dc492ba94e01af3174d50fb4550310d6b04ca37c..3d799c9ca6973a52b4be43b7f4a64b58912d38cc 100644 (file)
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@@ -13,15 +13,16 @@ openssl aes-256-cbc -K $encrypted_b0ee987fd0fc_key -iv $encrypted_b0ee987fd0fc_i
 tar xvf secrets.tar
 
 chmod 600 id_rsa_qmk_firmware
-chmod 600 qmk.fm
+chmod 600 id_rsa_qmk.fm
 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 push git@github.com:qmk/qmk_firmware.git master
 
 increment_version ()
 {
@@ -51,10 +52,10 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
        cd ..
        git clone git@github.com:qmk/qmk.fm.git
        cd qmk.fm
-       mv ../qmk_firmware/qmk.fm qmk.fm
+       mv ../qmk_firmware/id_rsa_qmk.fm id_rsa_qmk.fm
        ssh-add -D
        eval `ssh-agent -s`
-       ssh-add qmk.fm
+       ssh-add id_rsa_qmk.fm
        #git submodule update --init --recursive
        #rm -rf keyboard
        #rm -rf keyboards