diff options
| author | jpetermans <tibcmhhm@gmail.com> | 2017-05-24 11:51:20 -0700 |
|---|---|---|
| committer | jpetermans <tibcmhhm@gmail.com> | 2017-05-24 11:51:20 -0700 |
| commit | 2dcd6c38fa478b40a973c9411c3f5b4c87ae0ba7 (patch) | |
| tree | 289d5cce94ad5883741f0b637749d87680c14d33 /util | |
| parent | d89114400c398b900e27bf324a7973d1e0f25e58 (diff) | |
| parent | 7a4ec3bd926865e490fbf7c5ec68d762e998683f (diff) | |
Merge remote-tracking branch 'upstream/master' into infinity60
Diffstat (limited to 'util')
| -rw-r--r-- | util/ergodox_ez.html | 1 | ||||
| -rw-r--r-- | util/travis_compiled_push.sh | 13 |
2 files changed, 7 insertions, 7 deletions
diff --git a/util/ergodox_ez.html b/util/ergodox_ez.html deleted file mode 100644 index 8e92866070..0000000000 --- a/util/ergodox_ez.html +++ /dev/null @@ -1 +0,0 @@ -<html><head><meta http-equiv="refresh" content="0; url=http://qmk.fm/keyboards/ergodox/" /></head></html>
\ No newline at end of file diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index 58334cb1f6..718daaa295 100644 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh @@ -33,18 +33,19 @@ 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 + #git submodule update --init --recursive #rm -rf keyboard #rm -rf keyboards - yes | cp -rf ../qmk_firmware/keyboards . + #yes | cp -rf ../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 + #cp ../qmk_firmware/util/ergodox_ez.html keyboards/ergodox_ez/index.html + #cp ../qmk_firmware/readme.md qmk_readme.md + #./generate.sh + rm -f _compiled/*.hex + for file in ../qmk_firmware/keyboards/*/keymaps/*/*.hex; do mv -v "$file" "_compiled/${file##*/}"; done git add -A git commit -m "generated from qmk/qmk_firmware@${rev}" |