diff options
| author |  Toni <jeder@mail1a.de> | 2016-08-13 09:24:24 +0200 |
|---|---|---|
| committer | Toni <jeder@mail1a.de> | 2016-08-13 09:24:24 +0200 |
| commit | e0aa2169055f554a3cb87208b1e73a6b2707405b (patch) | |
| tree | 6c74a1f7284f385b99a231ef0c1c805fab1083e5 /util | |
| parent | cafa528b88c097f02ae92a5b15b015f5653cefe7 (diff) | |
| parent | 098951905d527c19043de75ef262ac9679ec452b (diff) | |
| download | qmk_firmware-e0aa2169055f554a3cb87208b1e73a6b2707405b.tar.gz | |
Merge remote-tracking branch 'origin/master' into iso_split_rshift
update from Upstream
Diffstat (limited to 'util')
| -rw-r--r-- | util/ergodox_ez.html | 1 | ||||
| -rw-r--r-- | util/travis_compiled_push.sh | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/util/ergodox_ez.html b/util/ergodox_ez.html new file mode 100644 index 000000000..8e9286607 --- /dev/null +++ b/util/ergodox_ez.html @@ -0,0 +1 @@ +<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 01317f4be..c2a994ef0 100644 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh @@ -7,6 +7,8 @@ rev=$(git rev-parse --short HEAD) git config --global user.name "Travis CI" git config --global user.email "jack.humb+travis.ci@gmail.com" +make all-keymaps keyboard=ergodox/ez AUTOGEN=true + find . -name ".build" | xargs rm -rf cd .. git clone https://$GH_TOKEN@github.com/jackhumbert/qmk.fm.git @@ -15,6 +17,8 @@ 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 |