diff options
| author | Ante Laurijssen <antelaurijssen@gmail.com> | 2017-05-18 05:06:57 +0200 |
|---|---|---|
| committer | Ante Laurijssen <antelaurijssen@gmail.com> | 2017-05-18 05:06:57 +0200 |
| commit | c686793b596cd3e2977a4c76b976df31e18bdb5b (patch) | |
| tree | d315194101743aab166e49dbc19e77522a6828c1 /util | |
| parent | 26c6f6a85c9c16a3be27e6c61609b3da99ec3f73 (diff) | |
| parent | aaa01d0a4e633e26c58e5bc9c0bc557604088140 (diff) | |
| download | qmk_firmware-c686793b596cd3e2977a4c76b976df31e18bdb5b.tar.gz qmk_firmware-c686793b596cd3e2977a4c76b976df31e18bdb5b.tar.xz | |
Merge https://github.com/qmk/qmk_firmware
Update from QMK main
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 8e9286607..000000000 --- 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 58334cb1f..718daaa29 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}" |