diff options
author | Gabriel Young <gabeplaysdrums@live.com> | 2017-02-19 14:34:58 -0800 |
---|---|---|
committer | Gabriel Young <gabeplaysdrums@live.com> | 2017-02-19 14:34:58 -0800 |
commit | 40a8a88e72c185eec629973580b72dfaaf71b116 (patch) | |
tree | 583330bc173017de5e1d4a10ff7100ebc0f1a34b /util | |
parent | 1e97f77278b757d740a800ae228c6202de0679b4 (diff) | |
parent | 49e72632d2200fc3bf71d5ced2aa43058da3b2e0 (diff) |
Merge branch 'qmk/master'
Diffstat (limited to 'util')
-rw-r--r-- | util/travis_compiled_push.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index de2481ce54..58334cb1f6 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 () { |