Run the python tests inside docker
This commit is contained in:
parent
16366dd23d
commit
6ca29f2b9b
1 changed files with 5 additions and 5 deletions
|
@ -2,9 +2,9 @@
|
||||||
|
|
||||||
# if docker is installed - call make within the qmk docker image
|
# if docker is installed - call make within the qmk docker image
|
||||||
if command -v docker >/dev/null; then
|
if command -v docker >/dev/null; then
|
||||||
function make() {
|
function make() {
|
||||||
docker run --rm -e MAKEFLAGS="$MAKEFLAGS" -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/base_container make "$@"
|
docker run --rm -e MAKEFLAGS="$MAKEFLAGS" -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/base_container make "$@"
|
||||||
}
|
}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# test force push
|
# test force push
|
||||||
|
@ -30,7 +30,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
|
||||||
eval $MAKE_ALL
|
eval $MAKE_ALL
|
||||||
: $((exit_code = $exit_code + $?))
|
: $((exit_code = $exit_code + $?))
|
||||||
else
|
else
|
||||||
# keyboards project format
|
# keyboards project format
|
||||||
# /keyboards/board1/rev/keymaps/
|
# /keyboards/board1/rev/keymaps/
|
||||||
# /keyboards/board2/keymaps/
|
# /keyboards/board2/keymaps/
|
||||||
# ensure we strip everything off after and including the keymaps folder to get board and/or revision
|
# ensure we strip everything off after and including the keymaps folder to get board and/or revision
|
||||||
|
@ -56,7 +56,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
|
||||||
if [ $PFM -gt 0 -o "$BRANCH" = "master" ]; then
|
if [ $PFM -gt 0 -o "$BRANCH" = "master" ]; then
|
||||||
echo
|
echo
|
||||||
echo "Running python tests."
|
echo "Running python tests."
|
||||||
bin/qmk nose2
|
docker run --rm -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/base_container bin/qmk nose2
|
||||||
: $((exit_code = $exit_code + $?))
|
: $((exit_code = $exit_code + $?))
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue