diff options
| author | skullY <skullydazed@gmail.com> | 2019-08-29 13:05:11 -0700 |
|---|---|---|
| committer | skullydazed <skullydazed@users.noreply.github.com> | 2019-09-07 07:58:41 -0700 |
| commit | 6ca29f2b9b02763aa3de607e8d08f14d5284918f (patch) | |
| tree | 68bedc51ebf49e3cf1c07bd9519da93c3be147f2 /util | |
| parent | 16366dd23d2c37932e2c0975800f0a8b30d53863 (diff) | |
| download | qmk_firmware-6ca29f2b9b02763aa3de607e8d08f14d5284918f.tar.gz qmk_firmware-6ca29f2b9b02763aa3de607e8d08f14d5284918f.zip | |
Run the python tests inside docker
Diffstat (limited to 'util')
| -rwxr-xr-x | util/travis_build.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/util/travis_build.sh b/util/travis_build.sh index 9ea0c5c4b..605b6d5f0 100755 --- a/util/travis_build.sh +++ b/util/travis_build.sh | |||
| @@ -2,9 +2,9 @@ | |||
| 2 | 2 | ||
| 3 | # if docker is installed - call make within the qmk docker image | 3 | # if docker is installed - call make within the qmk docker image |
| 4 | if command -v docker >/dev/null; then | 4 | if command -v docker >/dev/null; then |
| 5 | function make() { | 5 | function make() { |
| 6 | docker run --rm -e MAKEFLAGS="$MAKEFLAGS" -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/base_container make "$@" | 6 | docker run --rm -e MAKEFLAGS="$MAKEFLAGS" -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/base_container make "$@" |
| 7 | } | 7 | } |
| 8 | fi | 8 | fi |
| 9 | 9 | ||
| 10 | # test force push | 10 | # test force push |
| @@ -30,7 +30,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then | |||
| 30 | eval $MAKE_ALL | 30 | eval $MAKE_ALL |
| 31 | : $((exit_code = $exit_code + $?)) | 31 | : $((exit_code = $exit_code + $?)) |
| 32 | else | 32 | else |
| 33 | # keyboards project format | 33 | # keyboards project format |
| 34 | # /keyboards/board1/rev/keymaps/ | 34 | # /keyboards/board1/rev/keymaps/ |
| 35 | # /keyboards/board2/keymaps/ | 35 | # /keyboards/board2/keymaps/ |
| 36 | # ensure we strip everything off after and including the keymaps folder to get board and/or revision | 36 | # 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 | |||
| 56 | if [ $PFM -gt 0 -o "$BRANCH" = "master" ]; then | 56 | if [ $PFM -gt 0 -o "$BRANCH" = "master" ]; then |
| 57 | echo | 57 | echo |
| 58 | echo "Running python tests." | 58 | echo "Running python tests." |
| 59 | bin/qmk nose2 | 59 | docker run --rm -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/base_container bin/qmk nose2 |
| 60 | : $((exit_code = $exit_code + $?)) | 60 | : $((exit_code = $exit_code + $?)) |
| 61 | fi | 61 | fi |
| 62 | fi | 62 | fi |
