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) | |
| download | qmk_firmware-3a76f24cbdd0894af85fee79e371c5ca7cda0f71.tar.gz qmk_firmware-3a76f24cbdd0894af85fee79e371c5ca7cda0f71.zip | |
[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 b206d1451..e904d8af8 100644 --- a/.travis.yml +++ b/.travis.yml | |||
| @@ -19,7 +19,9 @@ install: | |||
| 19 | before_script: | 19 | before_script: |
| 20 | - avr-gcc --version | 20 | - avr-gcc --version |
| 21 | script: | 21 | script: |
| 22 | - make $TARGET AUTOGEN=$AUTOGEN | 22 | - 'if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then |
| 23 | make $TARGET AUTOGEN=$AUTOGEN | ||
| 24 | fi' | ||
| 23 | addons: | 25 | addons: |
| 24 | apt: | 26 | apt: |
| 25 | packages: | 27 | packages: |
diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index 9f23db972..f12da913c 100644 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh | |||
| @@ -26,21 +26,25 @@ else | |||
| 26 | echo "No essential files modified." | 26 | echo "No essential files modified." |
| 27 | fi | 27 | fi |
| 28 | 28 | ||
| 29 | make ergodox-ez AUTOGEN=true | 29 | if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then |
| 30 | 30 | ||
| 31 | find . -name ".build" | xargs rm -rf | 31 | make ergodox-ez AUTOGEN=true |
| 32 | cd .. | 32 | |
| 33 | git clone https://$GH_TOKEN@github.com/jackhumbert/qmk.fm.git | 33 | find . -name ".build" | xargs rm -rf |
| 34 | cd qmk.fm | 34 | cd .. |
| 35 | git submodule update --init --recursive | 35 | git clone https://$GH_TOKEN@github.com/jackhumbert/qmk.fm.git |
| 36 | rm -rf keyboard | 36 | cd qmk.fm |
| 37 | rm -rf keyboards | 37 | git submodule update --init --recursive |
| 38 | cp -r ../qmk_firmware/keyboards . | 38 | rm -rf keyboard |
| 39 | mkdir keyboards/ergodox_ez/ | 39 | rm -rf keyboards |
| 40 | cp ../qmk_firmware/util/ergodox_ez.html keyboards/ergodox_ez/index.html | 40 | cp -r ../qmk_firmware/keyboards . |
| 41 | cp ../qmk_firmware/readme.md qmk_readme.md | 41 | mkdir keyboards/ergodox_ez/ |
| 42 | ./generate.sh | 42 | cp ../qmk_firmware/util/ergodox_ez.html keyboards/ergodox_ez/index.html |
| 43 | 43 | cp ../qmk_firmware/readme.md qmk_readme.md | |
| 44 | git add -A | 44 | ./generate.sh |
| 45 | git commit -m "generated from qmk/qmk_firmware@${rev}" | 45 | |
| 46 | git push | 46 | git add -A |
| 47 | git commit -m "generated from qmk/qmk_firmware@${rev}" | ||
| 48 | git push | ||
| 49 | |||
| 50 | fi \ No newline at end of file | ||
