make travis convert line-endings and push a skippable commit

diff --git a/.travis.yml b/.travis.yml
index 1707c059916487567b8bda2a812bc18be62d25f4..e1cccf1e8d9711630d1e6fcba619e5f89461c017 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,6 +29,7 @@ addons:
     - binutils-arm-none-eabi
     - libnewlib-arm-none-eabi
     - diffutils
+    - dos2unix
 after_success: 
   bash util/travis_compiled_push.sh
 notifications:

diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index bdda0b344921c4b45df8b04d95a30cfa89fbc741..dc492ba94e01af3174d50fb4550310d6b04ca37c 100644 (file)
--- 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//\./ } )