summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorStanley Lai <stanleylai.sg@gmail.com>2016-12-17 22:49:13 +0100
committerStanley Lai <stanleylai.sg@gmail.com>2016-12-17 22:49:13 +0100
commitb49d7800aeae1009b39b2bff2121864425e73ce9 (patch)
treef73447fc32940c7bc6b691a83567186d1afbc991 /.travis.yml
parent9ecf9073b96799e52a1f1c0d35b57177382902ce (diff)
parentae95834f5af7404c04e6fe3446019046278d814b (diff)
downloadqmk_firmware-b49d7800aeae1009b39b2bff2121864425e73ce9.tar.gz
qmk_firmware-b49d7800aeae1009b39b2bff2121864425e73ce9.tar.xz
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml11
1 files changed, 9 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 26deac0ce..e74744a96 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,8 +9,11 @@ branches:
env:
global:
- secure: vBTSL34BDPxDilKUuTXqU4CJ26Pv5hogD2nghatkxSQkI1/jbdnLj/DQdPUrMJFDIY6TK3AltsBx72MaMsLQ1JO/Ou24IeHINHXzUC1FlS9yQa48cpxnhX5kzXNyGs3oa0qaFbvnr7RgYRWtmD52n4bIZuSuW+xpBv05x2OCizdT2ZonH33nATaHGFasxROm4qYZ241VfzcUv766V6RVHgL4x9V08warugs+RENVkfzxxwhk3NmkrISabze0gSVJLHBPHxroZC6EUcf/ocobcuDrCwFqtEt90i7pNIAFUE7gZsN2uE75LmpzAWin21G7lLPcPL2k4FJVd8an1HiP2WmscJU6U89fOfMb2viObnKcCzebozBCmKGtHEuXZo9FcReOx49AnQSpmESJGs+q2dL/FApkTjQiyT4J6O5dJpoww0/r57Wx0cmmqjETKBb5rSgXM51Etk3wO09mvcPHsEwrT7qH8r9XWdyCDoEn7FCLX3/LYnf/D4SmZ633YPl5gv3v9XEwxR5+04akjgnvWDSNIaDbWBdxHNb7l4pMc+WR1bwCyMyA7KXj0RrftEGOrm9ZRLe6BkbT4cycA+j77nbPOMcyZChliV9pPQos+4TOJoTzcK2L8yWVoY409aDNVuAjdP6Yum0R2maBGl/etLmIMpJC35C5/lZ+dUNjJAM=
+ matrix:
+ - TARGET=all-keyboards AUTOGEN=true
+ - TARGET=test AUTOGEN=false
script:
-- make all-keyboards-quick AUTOGEN=true
+- make $TARGET AUTOGEN=$AUTOGEN
addons:
apt:
packages:
@@ -21,4 +24,8 @@ addons:
- gcc-arm-none-eabi
- binutils-arm-none-eabi
- libnewlib-arm-none-eabi
-after_success: bash util/travis_compiled_push.sh
+ - diffutils
+after_success:
+ if [ "$AUTOGEN" == "true" ]; then
+ bash util/travis_compiled_push.sh;
+ fi