X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=util%2Ftravis_compiled_push.sh;h=a49908c71e4750b943909587ea43e5cbae65dbb9;hb=930e1dfc4c4d366fd85c6ce0652a071beaab91c0;hp=9ed1babe07acc66d07e4256f7e54e760ca895fc8;hpb=b702c08825c8a759aa14c2e1a97c74ec949d106f;p=qmk_firmware.git diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh old mode 100644 new mode 100755 index 9ed1babe0..a49908c71 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh @@ -38,7 +38,7 @@ increment_version () git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} -NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | grep -Ev '^(docs/)' | wc -l) +NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | grep -Ev '^(docs/)' | grep -Ev '^(users/)' | grep -Ev '^(layouts/)' | wc -l) if [[ $NEFM -gt 0 ]] ; then echo "Essential files modified." git fetch --tags @@ -54,26 +54,29 @@ else fi if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then - + make generate-keyboards-file SILENT=true > .keyboards cd .. git clone git@github.com:qmk/qmk.fm.git cd qmk.fm mv ../qmk_firmware/id_rsa_qmk.fm id_rsa_qmk.fm + mv ../qmk_firmware/.keyboards . ssh-add -D eval `ssh-agent -s` ssh-add id_rsa_qmk.fm - # not sure this is needed now + # don't delete files in case not all keyboards are built # rm -f compiled/*.hex # ignore errors here - for file in ../qmk_firmware/keyboards/*/keymaps/*/*.hex; do mv -v "$file" "compiled/${file##*/}" || true; done - for file in ../qmk_firmware/keyboards/*/*/keymaps/*/*.hex; do mv -v "$file" "compiled/${file##*/}" || true; done - + for file in ../qmk_firmware/keyboards/*/keymaps/*/*_default.hex; do mv -v "$file" "compiled/${file##*/}" || true; done + for file in ../qmk_firmware/keyboards/*/*/keymaps/*/*_default.hex; do mv -v "$file" "compiled/${file##*/}" || true; done + for file in ../qmk_firmware/keyboards/*/*/*/keymaps/*/*_default.hex; do mv -v "$file" "compiled/${file##*/}" || true; done + for file in ../qmk_firmware/keyboards/*/*/*/*/keymaps/*/*_default.hex; do mv -v "$file" "compiled/${file##*/}" || true; done + bash _util/generate_keyboard_page.sh git add -A git commit -m "generated from qmk/qmk_firmware@${rev}" git push git@github.com:qmk/qmk.fm.git fi -fi \ No newline at end of file +fi