diff options
| author | QMK Bot <hello@qmk.fm> | 2020-11-30 19:20:22 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2020-11-30 19:20:22 +0000 |
| commit | 4a5388a2b60b971542af4b2302f0208f05ca84f5 (patch) | |
| tree | e2b78e79aa1eb1dd5521d0a62b32e5167534ff30 /util | |
| parent | 3cc7d22732e201d5fd83931e5cfee21f83fd2352 (diff) | |
| parent | 8724a70c4c4329f09b9cf6dbda4dbefaaf3a3ee9 (diff) | |
| download | qmk_firmware-4a5388a2b60b971542af4b2302f0208f05ca84f5.tar.gz qmk_firmware-4a5388a2b60b971542af4b2302f0208f05ca84f5.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'util')
| -rwxr-xr-x | util/travis_build.sh | 2 | ||||
| -rw-r--r-- | util/travis_test.sh | 2 | ||||
| -rwxr-xr-x | util/travis_utils.sh | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/util/travis_build.sh b/util/travis_build.sh index 6d5dbed684..e7bbe36a7b 100755 --- a/util/travis_build.sh +++ b/util/travis_build.sh @@ -2,8 +2,6 @@ source util/travis_utils.sh -NUM_CORE_CHANGES=$(echo "$QMK_CHANGES" | grep -Ecv -e '^(docs/)' -e '^(keyboards/)' -e '^(layouts/)' -e '^(util/)' -e '^(lib/python/)' -e '^(bin/qmk)' -e '^(requirements.txt)' -e '(.travis.yml)') - if [[ "$TRAVIS_COMMIT_MESSAGE" == *"[skip build]"* ]]; then echo "Skipping due to commit message" exit 0 diff --git a/util/travis_test.sh b/util/travis_test.sh index c6fc0f9034..be0cfce001 100644 --- a/util/travis_test.sh +++ b/util/travis_test.sh @@ -2,8 +2,6 @@ source util/travis_utils.sh -NUM_CORE_CHANGES=$(echo "$QMK_CHANGES" | grep -Ecv -e '^(docs/)' -e '^(keyboards/)' -e '^(layouts/)' -e '^(util/)' -e '^(lib/python/)' -e '^(bin/qmk)' -e '^(requirements.txt)' -e '(.travis.yml)') - if [[ "$TRAVIS_COMMIT_MESSAGE" == *"[skip test]"* ]]; then echo "Skipping due to commit message" exit 0 diff --git a/util/travis_utils.sh b/util/travis_utils.sh index e3d806dfba..e949946e22 100755 --- a/util/travis_utils.sh +++ b/util/travis_utils.sh @@ -12,6 +12,7 @@ TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}" # Extra variables LOCAL_BRANCH=$(git rev-parse --abbrev-ref HEAD) QMK_CHANGES=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE}) +NUM_CORE_CHANGES=$(echo "$QMK_CHANGES" | grep -Ec -e '^Makefile' -e '^[^/]*.mk' -e '^drivers/' -e '^lib/atsam' -e '^lib/lib8tion/' -e '^platforms' -e '^quantum' -e '^tests' -e '^tmk_core') # if docker is installed - patch calls to within the qmk docker image if command -v docker >/dev/null; then |