aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml24
-rw-r--r--Dockerfile5
-rwxr-xr-xutil/travis_build.sh7
-rw-r--r--util/travis_test.sh7
4 files changed, 22 insertions, 21 deletions
diff --git a/.travis.yml b/.travis.yml
index 796be6c04..b4a76765c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,31 +11,21 @@ env:
11 global: 11 global:
12 - secure: vBTSL34BDPxDilKUuTXqU4CJ26Pv5hogD2nghatkxSQkI1/jbdnLj/DQdPUrMJFDIY6TK3AltsBx72MaMsLQ1JO/Ou24IeHINHXzUC1FlS9yQa48cpxnhX5kzXNyGs3oa0qaFbvnr7RgYRWtmD52n4bIZuSuW+xpBv05x2OCizdT2ZonH33nATaHGFasxROm4qYZ241VfzcUv766V6RVHgL4x9V08warugs+RENVkfzxxwhk3NmkrISabze0gSVJLHBPHxroZC6EUcf/ocobcuDrCwFqtEt90i7pNIAFUE7gZsN2uE75LmpzAWin21G7lLPcPL2k4FJVd8an1HiP2WmscJU6U89fOfMb2viObnKcCzebozBCmKGtHEuXZo9FcReOx49AnQSpmESJGs+q2dL/FApkTjQiyT4J6O5dJpoww0/r57Wx0cmmqjETKBb5rSgXM51Etk3wO09mvcPHsEwrT7qH8r9XWdyCDoEn7FCLX3/LYnf/D4SmZ633YPl5gv3v9XEwxR5+04akjgnvWDSNIaDbWBdxHNb7l4pMc+WR1bwCyMyA7KXj0RrftEGOrm9ZRLe6BkbT4cycA+j77nbPOMcyZChliV9pPQos+4TOJoTzcK2L8yWVoY409aDNVuAjdP6Yum0R2maBGl/etLmIMpJC35C5/lZ+dUNjJAM= 12 - secure: vBTSL34BDPxDilKUuTXqU4CJ26Pv5hogD2nghatkxSQkI1/jbdnLj/DQdPUrMJFDIY6TK3AltsBx72MaMsLQ1JO/Ou24IeHINHXzUC1FlS9yQa48cpxnhX5kzXNyGs3oa0qaFbvnr7RgYRWtmD52n4bIZuSuW+xpBv05x2OCizdT2ZonH33nATaHGFasxROm4qYZ241VfzcUv766V6RVHgL4x9V08warugs+RENVkfzxxwhk3NmkrISabze0gSVJLHBPHxroZC6EUcf/ocobcuDrCwFqtEt90i7pNIAFUE7gZsN2uE75LmpzAWin21G7lLPcPL2k4FJVd8an1HiP2WmscJU6U89fOfMb2viObnKcCzebozBCmKGtHEuXZo9FcReOx49AnQSpmESJGs+q2dL/FApkTjQiyT4J6O5dJpoww0/r57Wx0cmmqjETKBb5rSgXM51Etk3wO09mvcPHsEwrT7qH8r9XWdyCDoEn7FCLX3/LYnf/D4SmZ633YPl5gv3v9XEwxR5+04akjgnvWDSNIaDbWBdxHNb7l4pMc+WR1bwCyMyA7KXj0RrftEGOrm9ZRLe6BkbT4cycA+j77nbPOMcyZChliV9pPQos+4TOJoTzcK2L8yWVoY409aDNVuAjdP6Yum0R2maBGl/etLmIMpJC35C5/lZ+dUNjJAM=
13 - MAKEFLAGS="-j3 --output-sync" 13 - MAKEFLAGS="-j3 --output-sync"
14services:
15 - docker
14before_install: 16before_install:
15 - wget http://ww1.microchip.com/downloads/en/DeviceDoc/avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz || wget http://qmk.fm/avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz 17 - docker build -t qmkfm/qmk_firmware .
16 # Need DFU > .5 for dfu-suffix
17 - sudo add-apt-repository --yes ppa:tormodvolden/ppa
18 - sudo apt-get update -qq
19install: 18install:
20 - tar -zxf avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz
21 - export PATH="$PATH:$TRAVIS_BUILD_DIR/avr8-gnu-toolchain-linux_x86_64/bin"
22 - npm install -g moxygen 19 - npm install -g moxygen
23 - sudo apt-get -y --force-yes install dfu-util
24before_script:
25 - avr-gcc --version
26script: 20script:
27- git rev-parse --short HEAD 21 - git rev-parse --short HEAD
28- bash util/travis_test.sh 22 - bash util/travis_test.sh
29- bash util/travis_build.sh 23 - bash util/travis_build.sh
30- bash util/travis_docs.sh 24 - bash util/travis_docs.sh
31addons: 25addons:
32 apt: 26 apt:
33 packages: 27 packages:
34 - dfu-programmer
35 - pandoc 28 - pandoc
36 - gcc-arm-none-eabi
37 - binutils-arm-none-eabi
38 - libnewlib-arm-none-eabi
39 - diffutils 29 - diffutils
40 - dos2unix 30 - dos2unix
41 - doxygen 31 - doxygen
diff --git a/Dockerfile b/Dockerfile
index 6bd5acb33..dc9d96ecd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,11 +19,8 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
19 zip \ 19 zip \
20 && rm -rf /var/lib/apt/lists/* 20 && rm -rf /var/lib/apt/lists/*
21 21
22ENV KEYBOARD=ergodox_ez
23ENV KEYMAP=default
24
25VOLUME /qmk_firmware 22VOLUME /qmk_firmware
26WORKDIR /qmk_firmware 23WORKDIR /qmk_firmware
27COPY . . 24COPY . .
28 25
29CMD make $KEYBOARD:$KEYMAP 26CMD make all:default
diff --git a/util/travis_build.sh b/util/travis_build.sh
index 2c6c62931..02a749e85 100755
--- a/util/travis_build.sh
+++ b/util/travis_build.sh
@@ -1,5 +1,12 @@
1#!/bin/bash 1#!/bin/bash
2 2
3# if docker is installed - call make within the qmk docker image
4if command -v docker >/dev/null; then
5 function make() {
6 docker run --rm -e MAKEFLAGS="$MAKEFLAGS" -w /qmk_firmware/ -v "$PWD":/qmk_firmware qmkfm/qmk_firmware make "$@"
7 }
8fi
9
3# test force push 10# test force push
4#TRAVIS_COMMIT_RANGE="c287f1bfc5c8...81f62atc4c1d" 11#TRAVIS_COMMIT_RANGE="c287f1bfc5c8...81f62atc4c1d"
5 12
diff --git a/util/travis_test.sh b/util/travis_test.sh
index 6c48f898c..b6ec06f05 100644
--- a/util/travis_test.sh
+++ b/util/travis_test.sh
@@ -19,4 +19,11 @@ if [ "$BRANCH" != "master" ] && [ "$NUM_IMPACTING_CHANGES" == "0" ]; then
19 exit 0 19 exit 0
20fi 20fi
21 21
22# if docker is installed - call make within the qmk docker image
23if command -v docker >/dev/null; then
24 function make() {
25 docker run --rm -e MAKEFLAGS="$MAKEFLAGS" -w /qmk_firmware/ -v "$PWD":/qmk_firmware qmkfm/qmk_firmware make "$@"
26 }
27fi
28
22make test:all 29make test:all