diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-08-21 23:39:06 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2017-08-21 23:39:06 -0400 |
| commit | 11d27cec1e58a1873aaac2952f3fc6194195d883 (patch) | |
| tree | 99fa9578a0e9e5ff55e33bfebd7d7684043e0800 /util | |
| parent | 7a445d9167328df367c255ec3c64010fb040f298 (diff) | |
| download | qmk_firmware-11d27cec1e58a1873aaac2952f3fc6194195d883.tar.gz qmk_firmware-11d27cec1e58a1873aaac2952f3fc6194195d883.zip | |
attempt to fix line-ending travis stuff
Diffstat (limited to 'util')
| -rw-r--r-- | util/travis_compiled_push.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index 833fa8e46..3d799c9ca 100644 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh | |||
| @@ -18,10 +18,11 @@ eval `ssh-agent -s` | |||
| 18 | ssh-add id_rsa_qmk_firmware | 18 | ssh-add id_rsa_qmk_firmware |
| 19 | 19 | ||
| 20 | # convert to unix line-endings | 20 | # convert to unix line-endings |
| 21 | git checkout master | ||
| 21 | git diff --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 dos2unix | 22 | git diff --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 dos2unix |
| 22 | git diff --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 git add | 23 | git diff --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 git add |
| 23 | git commit -m "convert to unix line-endings [skip ci]" | 24 | git commit -m "convert to unix line-endings [skip ci]" |
| 24 | git push git@github.com:qmk/qmk_firmware.git | 25 | git push git@github.com:qmk/qmk_firmware.git master |
| 25 | 26 | ||
| 26 | increment_version () | 27 | increment_version () |
| 27 | { | 28 | { |
