From ba6b3fc1b55df7bb3e34721d2622837b394862a5 Mon Sep 17 00:00:00 2001 From: zvecr Date: Thu, 17 Jan 2019 17:08:23 +0000 Subject: Use qmk docker image for travis CI builds --- util/travis_build.sh | 7 +++++++ util/travis_test.sh | 7 +++++++ 2 files changed, 14 insertions(+) (limited to 'util') diff --git a/util/travis_build.sh b/util/travis_build.sh index 2c6c62931f..02a749e851 100755 --- a/util/travis_build.sh +++ b/util/travis_build.sh @@ -1,5 +1,12 @@ #!/bin/bash +# 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 qmkfm/qmk_firmware make "$@" + } +fi + # test force push #TRAVIS_COMMIT_RANGE="c287f1bfc5c8...81f62atc4c1d" diff --git a/util/travis_test.sh b/util/travis_test.sh index 6c48f898ce..b6ec06f059 100644 --- a/util/travis_test.sh +++ b/util/travis_test.sh @@ -19,4 +19,11 @@ if [ "$BRANCH" != "master" ] && [ "$NUM_IMPACTING_CHANGES" == "0" ]; then exit 0 fi +# 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 qmkfm/qmk_firmware make "$@" + } +fi + make test:all -- cgit v1.2.3