diff options
| author | skullY <skullydazed@gmail.com> | 2019-08-29 12:31:16 -0700 |
|---|---|---|
| committer | skullydazed <skullydazed@users.noreply.github.com> | 2019-09-07 07:58:41 -0700 |
| commit | 18690ddaeaa66de91bcd635fb2eeee4364e1d162 (patch) | |
| tree | b72e7691546d465030069762f039f1dc32b4bc84 /util | |
| parent | 1013ae2d34dc34e0e7d63fe875e70801ded3673c (diff) | |
| download | qmk_firmware-18690ddaeaa66de91bcd635fb2eeee4364e1d162.tar.gz qmk_firmware-18690ddaeaa66de91bcd635fb2eeee4364e1d162.zip | |
filter python from the list of things that trigger default builds
Diffstat (limited to 'util')
| -rwxr-xr-x | util/travis_build.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/travis_build.sh b/util/travis_build.sh index 3fff768f6..81546c115 100755 --- a/util/travis_build.sh +++ b/util/travis_build.sh | |||
| @@ -22,7 +22,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then | |||
| 22 | eval $MAKE_ALL | 22 | eval $MAKE_ALL |
| 23 | : $((exit_code = $exit_code + $?)) | 23 | : $((exit_code = $exit_code + $?)) |
| 24 | else | 24 | else |
| 25 | NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | grep -Ev '^(docs/)' | wc -l) | 25 | NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | grep -Ev '^(docs/)' | grep -Ev '^(lib/python/)' | grep -Ev (^bin/qmk) | wc -l) |
| 26 | BRANCH=$(git rev-parse --abbrev-ref HEAD) | 26 | BRANCH=$(git rev-parse --abbrev-ref HEAD) |
| 27 | # is this branch master or a "non docs, non keyboards" change | 27 | # is this branch master or a "non docs, non keyboards" change |
| 28 | if [ $NEFM -gt 0 -o "$BRANCH" = "master" ]; then | 28 | if [ $NEFM -gt 0 -o "$BRANCH" = "master" ]; then |
| @@ -52,7 +52,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then | |||
| 52 | done | 52 | done |
| 53 | fi | 53 | fi |
| 54 | # Check and run python tests if necessary | 54 | # Check and run python tests if necessary |
| 55 | PFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -E '^(lib/python/)' | wc -l) | 55 | PFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -E -e '^(lib/python/)' -e '^(bin/qmk)' | wc -l) |
| 56 | if [ $PFM -gt 0 -o "$BRANCH" = "master" ]; then | 56 | if [ $PFM -gt 0 -o "$BRANCH" = "master" ]; then |
| 57 | echo | 57 | echo |
| 58 | echo "Running python tests." | 58 | echo "Running python tests." |