X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=util%2Ftravis_compiled_push.sh;h=58334cb1f687c73b072fc07773929afbed6cb5cb;hb=40a8a88e72c185eec629973580b72dfaaf71b116;hp=3751da1e53afd5bd4ef1993dc075004ac7f1726b;hpb=b6ffda484971306264c8c95facf75eec4c85b62a;p=qmk_firmware.git diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index 3751da1e5..58334cb1f 100644 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh @@ -7,7 +7,7 @@ rev=$(git rev-parse --short HEAD) git config --global user.name "Travis CI" git config --global user.email "jack.humb+travis.ci@gmail.com" -if [[ "$TRAVIS_BRANCH" == "master" ]] ; then +if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then increment_version () { @@ -38,10 +38,10 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then git clone https://$GH_TOKEN@github.com/jackhumbert/qmk.fm.git cd qmk.fm git submodule update --init --recursive - rm -rf keyboard - rm -rf keyboards - cp -r ../qmk_firmware/keyboards . - mkdir keyboards/ergodox_ez/ + #rm -rf keyboard + #rm -rf 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