diff options
| author | Priyadi Iman Nurcahyo <priyadi@priyadi.net> | 2017-02-17 00:35:32 +0700 |
|---|---|---|
| committer | Priyadi Iman Nurcahyo <priyadi@priyadi.net> | 2017-02-17 00:35:32 +0700 |
| commit | c18d0a83e6eb8f415b288a6f5ababe9ec12ee52b (patch) | |
| tree | 9609b587ac401133cec79035b31dc81b65f8dbed /util | |
| parent | e5bd81f0a68948a87ad5279bc2c41a4876466023 (diff) | |
| parent | 1ac5dc9e524444ef98cfab1d9822151a6bfb9621 (diff) | |
| download | firmware-c18d0a83e6eb8f415b288a6f5ababe9ec12ee52b.tar.gz firmware-c18d0a83e6eb8f415b288a6f5ababe9ec12ee52b.tar.bz2 firmware-c18d0a83e6eb8f415b288a6f5ababe9ec12ee52b.zip | |
Merge branch 'master' into promethium
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 () { |