Browse Source

Use qmk docker image for travis CI builds

zvecr 6 years ago
parent
commit
ba6b3fc1b5
4 changed files with 22 additions and 21 deletions
  1. 7 17
      .travis.yml
  2. 1 4
      Dockerfile
  3. 7 0
      util/travis_build.sh
  4. 7 0
      util/travis_test.sh

File diff suppressed because it is too large
+ 7 - 17
.travis.yml


+ 1 - 4
Dockerfile

@@ -19,11 +19,8 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
     zip \
     zip \
     && rm -rf /var/lib/apt/lists/*
     && rm -rf /var/lib/apt/lists/*
 
 
-ENV KEYBOARD=ergodox_ez
-ENV KEYMAP=default
-
 VOLUME /qmk_firmware
 VOLUME /qmk_firmware
 WORKDIR /qmk_firmware
 WORKDIR /qmk_firmware
 COPY . .
 COPY . .
 
 
-CMD make $KEYBOARD:$KEYMAP
+CMD make all:default

+ 7 - 0
util/travis_build.sh

@@ -1,5 +1,12 @@
 #!/bin/bash
 #!/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
 # test force push
 #TRAVIS_COMMIT_RANGE="c287f1bfc5c8...81f62atc4c1d"
 #TRAVIS_COMMIT_RANGE="c287f1bfc5c8...81f62atc4c1d"
 
 

+ 7 - 0
util/travis_test.sh

@@ -19,4 +19,11 @@ if [ "$BRANCH" != "master" ] && [ "$NUM_IMPACTING_CHANGES" == "0" ]; then
     exit 0
     exit 0
 fi
 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
 make test:all