From fa6bcfd10c4ff70d90c4223c2b5058b06138267a Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Mon, 7 Aug 2017 11:19:13 -0400 Subject: make travis convert line-endings and push a skippable commit --- .travis.yml | 1 + util/travis_compiled_push.sh | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index 1707c05991..e1cccf1e8d 100644 --- 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 bdda0b3449..dc492ba94e 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//\./ } ) -- cgit v1.2.3