Browse Source

Reduce travis load by replacing an exclusive grep with an inclusive grep (#10964)

* add -n to avoid compiling

* switch to an include rather than exclude strategy
master
Zach White 2 years ago committed by GitHub
parent
commit
8724a70c4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      lib/python/qmk/tests/test_cli_commands.py
  2. 2
      util/travis_build.sh
  3. 2
      util/travis_test.sh
  4. 1
      util/travis_utils.sh

2
lib/python/qmk/tests/test_cli_commands.py

@ -34,7 +34,7 @@ def test_compile():
def test_compile_json():
result = check_subcommand('compile', '-kb', 'handwired/onekey/pytest', '-km', 'default_json')
result = check_subcommand('compile', '-kb', 'handwired/onekey/pytest', '-km', 'default_json', '-n')
check_returncode(result)

2
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

2
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

1
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

Loading…
Cancel
Save