Merge pull request #1097 from stanleylai/master

[qmk_firmware.git] / util / travis_compiled_push.sh

diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index 6ec558cac649b532a3e832776031fea095ffe541..58334cb1f687c73b072fc07773929afbed6cb5cb 100644 (file)
--- 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 ()
 {
@@ -41,7 +41,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
        #rm -rf keyboard
        #rm -rf keyboards
        yes | cp -rf ../qmk_firmware/keyboards .
-       mkdir keyboards/ergodox_ez/
+       #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