diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-02-19 00:04:14 -0500 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2017-02-19 00:04:14 -0500 |
| commit | c2239e6b96fdea11d449d220db3d8bca40b38bde (patch) | |
| tree | 0c2fe7df345868b56dfb3478ceb1b54a1e8eec29 /util | |
| parent | 8d0fdf10086a0e8a1615f0521fccf1f5a2806497 (diff) | |
| parent | 49e72632d2200fc3bf71d5ced2aa43058da3b2e0 (diff) | |
| download | firmware-c2239e6b96fdea11d449d220db3d8bca40b38bde.tar.gz firmware-c2239e6b96fdea11d449d220db3d8bca40b38bde.tar.bz2 firmware-c2239e6b96fdea11d449d220db3d8bca40b38bde.zip | |
merging
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 de2481ce5..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 () { |