diff options
| author | milestogo <milestogo@users.noreply.github.com> | 2017-03-08 15:50:46 -0800 |
|---|---|---|
| committer | milestogo <milestogo@users.noreply.github.com> | 2017-03-08 15:50:46 -0800 |
| commit | ffb04bad660ba7c487e4b923e4391b6c7dd5eddd (patch) | |
| tree | de8446b9b4d62611b7ff7c99394cbdb73ffe558e /util | |
| parent | 1622d7147b1647a7e0da47386c919a5a95cd1a29 (diff) | |
| parent | bfa7e6ce04624f624cb8925cd5b5490801ced738 (diff) | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'util')
| -rwxr-xr-x | util/install_dependencies.sh | 19 | ||||
| -rw-r--r-- | util/travis_compiled_push.sh | 2 |
2 files changed, 20 insertions, 1 deletions
diff --git a/util/install_dependencies.sh b/util/install_dependencies.sh index 936a865938..1b73a8b3bf 100755 --- a/util/install_dependencies.sh +++ b/util/install_dependencies.sh @@ -92,4 +92,23 @@ elif [[ -n "$(type -P zypper)" ]]; then # TODO: The avr and eabi tools are not available as default packages, so we need # another way to install them +elif [[ -n "$(type -P pkg)" ]]; then + # FreeBSD + pkg update + pkg install -y \ + git \ + wget \ + gmake \ + gcc \ + zip \ + unzip \ + avr-binutils \ + avr-gcc \ + avr-libc \ + dfu-programmer \ + dfu-util \ + arm-none-eabi-gcc \ + arm-none-eabi-binutils \ + arm-none-eabi-newlib \ + diffutils fi 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 () { |