From 215c2119af5281072d5a6efb0308408793cadd08 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Wed, 29 Jun 2016 16:21:41 -0400 Subject: Implements subprojects and updates projects for this (#459) * non-working commit * working * subprojects implemented for planck * pass a subproject variable through to c * consolidates clueboard revisions * thanks for letting me know about conflicts.. * turn off audio for yang's * corrects starting paths for subprojects * messing around with travis * semicolon * travis script * travis script * script for travis * correct directory (probably), amend files to commit * remove origin before adding * git pull, correct syntax * git checkout * git pull origin branch * where are we? * where are we? * merging * force things to happen * adds commit message, adds add * rebase, no commit message * rebase branch * idk! * try just pull * fetch - merge * specify repo branch * checkout * goddammit * merge? idk * pls * after all * don't split up keyboards * syntax * adds quick for all-keyboards * trying out new script * script update * lowercase * all keyboards * stop replacing compiled.hex automatically * adds if statement * skip automated build branches * forces push to automated build branch * throw an add in there * upstream? * adds AUTOGEN * ignore all .hex files again * testing out new repo * global ident * generate script, keyboard_keymap.hex * skip generation for now, print pandoc info, submodule update * try trusty * and sudo * try generate * updates subprojects to keyboards * no idea * updates to keyboards * cleans up clueboard stuff * setup to use local readme * updates cluepad, planck experimental * remove extra led.c [ci skip] * disable power up for now * config files updates * makefile updates * .h file updates, config tuning * disable audio for yang --- .travis.yml | 50 ++++++++++++++++---------------------------------- 1 file changed, 16 insertions(+), 34 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 151f8618de..f5ae78c898 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,39 +1,21 @@ -os: - - linux - -language: - - c - -compiler: - - avr-gcc - +os: linux +dist: trusty +sudo: required +language: c +compiler: avr-gcc +branches: + except: + - /^.*-automated-build$/ env: - - KEYBOARD=alps64 - - KEYBOARD=arrow_pad - - KEYBOARD=atomic - - KEYBOARD=atreus - - KEYBOARD=bantam44 - - KEYBOARD=clueboard1 - - KEYBOARD=clueboard2 - - KEYBOARD=cluepad - - KEYBOARD=ergodox_ez - - KEYBOARD=gh60 - - KEYBOARD=hhkb - - KEYBOARD=jd45 - - KEYBOARD=kc60 - - KEYBOARD=phantom - - KEYBOARD=planck - - KEYBOARD=preonic - - KEYBOARD=retro_refit - - KEYBOARD=satan - - KEYBOARD=sixkeyboard - + global: + - secure: vBTSL34BDPxDilKUuTXqU4CJ26Pv5hogD2nghatkxSQkI1/jbdnLj/DQdPUrMJFDIY6TK3AltsBx72MaMsLQ1JO/Ou24IeHINHXzUC1FlS9yQa48cpxnhX5kzXNyGs3oa0qaFbvnr7RgYRWtmD52n4bIZuSuW+xpBv05x2OCizdT2ZonH33nATaHGFasxROm4qYZ241VfzcUv766V6RVHgL4x9V08warugs+RENVkfzxxwhk3NmkrISabze0gSVJLHBPHxroZC6EUcf/ocobcuDrCwFqtEt90i7pNIAFUE7gZsN2uE75LmpzAWin21G7lLPcPL2k4FJVd8an1HiP2WmscJU6U89fOfMb2viObnKcCzebozBCmKGtHEuXZo9FcReOx49AnQSpmESJGs+q2dL/FApkTjQiyT4J6O5dJpoww0/r57Wx0cmmqjETKBb5rSgXM51Etk3wO09mvcPHsEwrT7qH8r9XWdyCDoEn7FCLX3/LYnf/D4SmZ633YPl5gv3v9XEwxR5+04akjgnvWDSNIaDbWBdxHNb7l4pMc+WR1bwCyMyA7KXj0RrftEGOrm9ZRLe6BkbT4cycA+j77nbPOMcyZChliV9pPQos+4TOJoTzcK2L8yWVoY409aDNVuAjdP6Yum0R2maBGl/etLmIMpJC35C5/lZ+dUNjJAM= script: - - cd keyboards/$KEYBOARD && make all-keymaps - +- make all-keyboards quick AUTOGEN=true addons: apt: packages: - - avr-libc - - gcc-avr - - dfu-programmer + - avr-libc + - gcc-avr + - dfu-programmer + - pandoc +after_success: bash util/travis_compiled_push.sh \ No newline at end of file -- cgit v1.2.3