diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-02-06 16:42:18 -0500 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2017-02-06 16:42:18 -0500 |
| commit | 3a76f24cbdd0894af85fee79e371c5ca7cda0f71 (patch) | |
| tree | 1f72f9e7d10f855c2620a5a98d447a50d9b12201 | |
| parent | 835cacb031faabadf2c09de51323506f8f41b4ef (diff) | |
[skip build] testing travis script
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | util/travis_compiled_push.sh | 40 |
2 files changed, 25 insertions, 19 deletions
diff --git a/.travis.yml b/.travis.yml index b206d1451b..e904d8af84 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,9 @@ install: before_script: - avr-gcc --version script: -- make $TARGET AUTOGEN=$AUTOGEN +- 'if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then +make $TARGET AUTOGEN=$AUTOGEN +fi' addons: apt: packages: diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index 9f23db972f..f12da913cf 100644 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh @@ -26,21 +26,25 @@ else echo "No essential files modified." fi -make ergodox-ez AUTOGEN=true - -find . -name ".build" | xargs rm -rf -cd .. -git clone https://$GH_TOKEN@github.com/jackhumbert/qmk.fm.git -cd qmk.fm -git submodule update --init --recursive -rm -rf keyboard -rm -rf keyboards -cp -r ../qmk_firmware/keyboards . -mkdir keyboards/ergodox_ez/ -cp ../qmk_firmware/util/ergodox_ez.html keyboards/ergodox_ez/index.html -cp ../qmk_firmware/readme.md qmk_readme.md -./generate.sh - -git add -A -git commit -m "generated from qmk/qmk_firmware@${rev}" -git push +if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then + + make ergodox-ez AUTOGEN=true + + find . -name ".build" | xargs rm -rf + cd .. + git clone https://$GH_TOKEN@github.com/jackhumbert/qmk.fm.git + cd qmk.fm + git submodule update --init --recursive + rm -rf keyboard + rm -rf keyboards + cp -r ../qmk_firmware/keyboards . + mkdir keyboards/ergodox_ez/ + cp ../qmk_firmware/util/ergodox_ez.html keyboards/ergodox_ez/index.html + cp ../qmk_firmware/readme.md qmk_readme.md + ./generate.sh + + git add -A + git commit -m "generated from qmk/qmk_firmware@${rev}" + git push + +fi \ No newline at end of file |