diff options
| author | zvecr <git@zvecr.com> | 2019-01-17 17:08:23 +0000 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2019-05-31 11:04:16 -0700 |
| commit | ba6b3fc1b55df7bb3e34721d2622837b394862a5 (patch) | |
| tree | 56ba76073f1d700a392872558f61ec5ad578d0c4 /util | |
| parent | 6693d16362a807c770d282a2622ab0287a588dfe (diff) | |
Use qmk docker image for travis CI builds
Diffstat (limited to 'util')
| -rwxr-xr-x | util/travis_build.sh | 7 | ||||
| -rw-r--r-- | util/travis_test.sh | 7 |
2 files changed, 14 insertions, 0 deletions
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 |