X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=util%2Ftravis_compiled_push.sh;h=dc492ba94e01af3174d50fb4550310d6b04ca37c;hb=fa6bcfd10c4ff70d90c4223c2b5058b06138267a;hp=4936ca0ba714a5432749d3f0d0460339d7e579ec;hpb=8655d4f4948b2deef7844503c8d690f23ac1a062;p=qmk_firmware.git diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index 4936ca0ba..dc492ba94 100644 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh @@ -17,6 +17,12 @@ chmod 600 qmk.fm eval `ssh-agent -s` ssh-add id_rsa_qmk_firmware +# convert to unix line-endings +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 + increment_version () { declare -a part=( ${1//\./ } ) @@ -42,12 +48,12 @@ fi if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then - make ergodox-ez AUTOGEN=true - cd .. git clone git@github.com:qmk/qmk.fm.git cd qmk.fm mv ../qmk_firmware/qmk.fm qmk.fm + ssh-add -D + eval `ssh-agent -s` ssh-add qmk.fm #git submodule update --init --recursive #rm -rf keyboard