Move running pytest to travis_test (#7005)
This commit is contained in:
parent
6560dffc05
commit
e1de0d74a6
2 changed files with 27 additions and 19 deletions
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
# if docker is installed - call make within the qmk docker image
|
||||
# if docker is installed - patch calls to within the qmk docker image
|
||||
if command -v docker >/dev/null; then
|
||||
function make() {
|
||||
docker run --rm -e MAKEFLAGS="$MAKEFLAGS" -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/base_container make "$@"
|
||||
|
@ -52,14 +52,6 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
|
|||
fi
|
||||
done
|
||||
fi
|
||||
# Check and run python tests if necessary
|
||||
PFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -E -e '^(lib/python/)' -e '^(bin/qmk)' | wc -l)
|
||||
if [ $PFM -gt 0 -o "$BRANCH" = "master" ]; then
|
||||
echo
|
||||
echo "Running python tests."
|
||||
docker run --rm -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/base_container 'bin/qmk pytest'
|
||||
: $((exit_code = $exit_code + $?))
|
||||
fi
|
||||
fi
|
||||
exit $exit_code
|
||||
fi
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue