diff options
-rw-r--r-- | lib/python/qmk/tests/test_cli_commands.py | 2 | ||||
-rwxr-xr-x | util/travis_build.sh | 2 | ||||
-rw-r--r-- | util/travis_test.sh | 2 | ||||
-rwxr-xr-x | util/travis_utils.sh | 1 |
4 files changed, 2 insertions, 5 deletions
diff --git a/lib/python/qmk/tests/test_cli_commands.py b/lib/python/qmk/tests/test_cli_commands.py index dd0c572a7..99ec59608 100644 --- a/lib/python/qmk/tests/test_cli_commands.py +++ b/lib/python/qmk/tests/test_cli_commands.py | |||
@@ -34,7 +34,7 @@ def test_compile(): | |||
34 | 34 | ||
35 | 35 | ||
36 | def test_compile_json(): | 36 | def test_compile_json(): |
37 | result = check_subcommand('compile', '-kb', 'handwired/onekey/pytest', '-km', 'default_json') | 37 | result = check_subcommand('compile', '-kb', 'handwired/onekey/pytest', '-km', 'default_json', '-n') |
38 | check_returncode(result) | 38 | check_returncode(result) |
39 | 39 | ||
40 | 40 | ||
diff --git a/util/travis_build.sh b/util/travis_build.sh index 6d5dbed68..e7bbe36a7 100755 --- a/util/travis_build.sh +++ b/util/travis_build.sh | |||
@@ -2,8 +2,6 @@ | |||
2 | 2 | ||
3 | source util/travis_utils.sh | 3 | source util/travis_utils.sh |
4 | 4 | ||
5 | 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)') | ||
6 | |||
7 | if [[ "$TRAVIS_COMMIT_MESSAGE" == *"[skip build]"* ]]; then | 5 | if [[ "$TRAVIS_COMMIT_MESSAGE" == *"[skip build]"* ]]; then |
8 | echo "Skipping due to commit message" | 6 | echo "Skipping due to commit message" |
9 | exit 0 | 7 | exit 0 |
diff --git a/util/travis_test.sh b/util/travis_test.sh index c6fc0f903..be0cfce00 100644 --- a/util/travis_test.sh +++ b/util/travis_test.sh | |||
@@ -2,8 +2,6 @@ | |||
2 | 2 | ||
3 | source util/travis_utils.sh | 3 | source util/travis_utils.sh |
4 | 4 | ||
5 | 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)') | ||
6 | |||
7 | if [[ "$TRAVIS_COMMIT_MESSAGE" == *"[skip test]"* ]]; then | 5 | if [[ "$TRAVIS_COMMIT_MESSAGE" == *"[skip test]"* ]]; then |
8 | echo "Skipping due to commit message" | 6 | echo "Skipping due to commit message" |
9 | exit 0 | 7 | exit 0 |
diff --git a/util/travis_utils.sh b/util/travis_utils.sh index e3d806dfb..e949946e2 100755 --- a/util/travis_utils.sh +++ b/util/travis_utils.sh | |||
@@ -12,6 +12,7 @@ TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}" | |||
12 | # Extra variables | 12 | # Extra variables |
13 | LOCAL_BRANCH=$(git rev-parse --abbrev-ref HEAD) | 13 | LOCAL_BRANCH=$(git rev-parse --abbrev-ref HEAD) |
14 | QMK_CHANGES=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE}) | 14 | QMK_CHANGES=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE}) |
15 | 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') | ||
15 | 16 | ||
16 | # if docker is installed - patch calls to within the qmk docker image | 17 | # if docker is installed - patch calls to within the qmk docker image |
17 | if command -v docker >/dev/null; then | 18 | if command -v docker >/dev/null; then |