diff options
| author | milestogo <milestogo@users.noreply.github.com> | 2017-03-09 00:51:30 +0100 |
|---|---|---|
| committer | milestogo <milestogo@users.noreply.github.com> | 2017-03-09 00:51:30 +0100 |
| commit | feb858c5a9afff06ff54ec401359f8bfd5abdd73 (patch) | |
| tree | cf61bfad47984bb4987540404f0ec349defbff1a /util | |
| parent | b5bfb5104b63766ab9a54509302a3f4b0b1d7b16 (diff) | |
| parent | ffb04bad660ba7c487e4b923e4391b6c7dd5eddd (diff) | |
| download | qmk_firmware-feb858c5a9afff06ff54ec401359f8bfd5abdd73.tar.gz qmk_firmware-feb858c5a9afff06ff54ec401359f8bfd5abdd73.tar.xz | |
Merge branch 'master' into sculpt2
Diffstat (limited to 'util')
| -rwxr-xr-x | util/install_dependencies.sh | 19 | ||||
| -rw-r--r-- | util/travis_build.sh | 2 | ||||
| -rw-r--r-- | util/travis_compiled_push.sh | 2 |
3 files changed, 21 insertions, 2 deletions
diff --git a/util/install_dependencies.sh b/util/install_dependencies.sh index 936a86593..1b73a8b3b 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_build.sh b/util/travis_build.sh index 2d43f3e5e..6bafd1941 100644 --- a/util/travis_build.sh +++ b/util/travis_build.sh @@ -11,7 +11,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then make all-keyboards AUTOGEN="true" : $((exit_code = $exit_code + $?)) else - MKB=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -oP '(?<=keyboards\/)([a-zA-Z0-9_]+)' | sort -u) + MKB=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -oP '(?<=keyboards\/)([a-zA-Z0-9_]+)(?=\/)' | sort -u) for KB in $MKB ; do echo "Making all keymaps for $KB" make "$KB" AUTOGEN=true 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 () { |