summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorskullY <skullydazed@gmail.com>2019-08-29 13:05:11 -0700
committerskullydazed <skullydazed@users.noreply.github.com>2019-09-07 07:58:41 -0700
commit6ca29f2b9b02763aa3de607e8d08f14d5284918f (patch)
tree68bedc51ebf49e3cf1c07bd9519da93c3be147f2
parent16366dd23d2c37932e2c0975800f0a8b30d53863 (diff)
Run the python tests inside docker
-rwxr-xr-xutil/travis_build.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/util/travis_build.sh b/util/travis_build.sh
index 9ea0c5c4b9..605b6d5f05 100755
--- a/util/travis_build.sh
+++ b/util/travis_build.sh
@@ -2,9 +2,9 @@
# if docker is installed - call make 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 "$@"
- }
+ function make() {
+ docker run --rm -e MAKEFLAGS="$MAKEFLAGS" -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/base_container make "$@"
+ }
fi
# test force push
@@ -30,7 +30,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
eval $MAKE_ALL
: $((exit_code = $exit_code + $?))
else
- # keyboards project format
+ # keyboards project format
# /keyboards/board1/rev/keymaps/
# /keyboards/board2/keymaps/
# 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
echo
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 + $?))
fi
fi