From 84661ac44b15bd5e60cc223779fea05784672011 Mon Sep 17 00:00:00 2001 From: Luiz Ribeiro Date: Sun, 22 Jan 2017 12:06:14 -0500 Subject: Upgrade AVR 8-bit Toolchain to 3.5.4 on Travis --- .travis.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index e74744a96..b206d1451 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ os: linux dist: trusty sudo: required language: c -compiler: avr-gcc branches: except: - /^.*-automated-build$/ @@ -12,13 +11,18 @@ env: matrix: - TARGET=all-keyboards AUTOGEN=true - TARGET=test AUTOGEN=false +before_install: + - wget http://www.atmel.com/images/avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz +install: + - tar -zxf avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz + - export PATH="$PATH:$TRAVIS_BUILD_DIR/avr8-gnu-toolchain-linux_x86_64/bin" +before_script: + - avr-gcc --version script: - make $TARGET AUTOGEN=$AUTOGEN addons: apt: packages: - - avr-libc - - gcc-avr - dfu-programmer - pandoc - gcc-arm-none-eabi -- cgit v1.2.3 From 3a76f24cbdd0894af85fee79e371c5ca7cda0f71 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Mon, 6 Feb 2017 16:42:18 -0500 Subject: [skip build] testing travis script --- .travis.yml | 4 +++- util/travis_compiled_push.sh | 40 ++++++++++++++++++++++------------------ 2 files changed, 25 insertions(+), 19 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index b206d1451..e904d8af8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,9 @@ install: before_script: - avr-gcc --version script: -- make $TARGET AUTOGEN=$AUTOGEN +- 'if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then +make $TARGET AUTOGEN=$AUTOGEN +fi' addons: apt: packages: diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index 9f23db972..f12da913c 100644 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh @@ -26,21 +26,25 @@ else echo "No essential files modified." fi -make ergodox-ez AUTOGEN=true - -find . -name ".build" | xargs rm -rf -cd .. -git clone https://$GH_TOKEN@github.com/jackhumbert/qmk.fm.git -cd qmk.fm -git submodule update --init --recursive -rm -rf keyboard -rm -rf keyboards -cp -r ../qmk_firmware/keyboards . -mkdir keyboards/ergodox_ez/ -cp ../qmk_firmware/util/ergodox_ez.html keyboards/ergodox_ez/index.html -cp ../qmk_firmware/readme.md qmk_readme.md -./generate.sh - -git add -A -git commit -m "generated from qmk/qmk_firmware@${rev}" -git push +if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then + + make ergodox-ez AUTOGEN=true + + find . -name ".build" | xargs rm -rf + cd .. + git clone https://$GH_TOKEN@github.com/jackhumbert/qmk.fm.git + cd qmk.fm + git submodule update --init --recursive + rm -rf keyboard + rm -rf keyboards + cp -r ../qmk_firmware/keyboards . + mkdir keyboards/ergodox_ez/ + cp ../qmk_firmware/util/ergodox_ez.html keyboards/ergodox_ez/index.html + cp ../qmk_firmware/readme.md qmk_readme.md + ./generate.sh + + git add -A + git commit -m "generated from qmk/qmk_firmware@${rev}" + git push + +fi \ No newline at end of file -- cgit v1.2.3 From 470c8436c2428dba885dfa6e4b7d4f5e725a9d07 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Mon, 6 Feb 2017 16:46:44 -0500 Subject: [skip build] testing travis script --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index e904d8af8..1a0a7bf15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,9 +19,7 @@ install: before_script: - avr-gcc --version script: -- 'if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then -make $TARGET AUTOGEN=$AUTOGEN -fi' +- 'if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then make $TARGET AUTOGEN=$AUTOGEN; fi' addons: apt: packages: -- cgit v1.2.3 From 5c8cdfd2b579c198ad37504772e663783f530685 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Mon, 6 Feb 2017 17:51:20 -0500 Subject: [skip build] testing travis script --- .travis.yml | 1 + util/travis_compiled_push.sh | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 1a0a7bf15..792f2cd05 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ language: c branches: except: - /^.*-automated-build$/ + - /^[0-9]+\.[0-9]+\.[0-9]+/ env: global: - secure: vBTSL34BDPxDilKUuTXqU4CJ26Pv5hogD2nghatkxSQkI1/jbdnLj/DQdPUrMJFDIY6TK3AltsBx72MaMsLQ1JO/Ou24IeHINHXzUC1FlS9yQa48cpxnhX5kzXNyGs3oa0qaFbvnr7RgYRWtmD52n4bIZuSuW+xpBv05x2OCizdT2ZonH33nATaHGFasxROm4qYZ241VfzcUv766V6RVHgL4x9V08warugs+RENVkfzxxwhk3NmkrISabze0gSVJLHBPHxroZC6EUcf/ocobcuDrCwFqtEt90i7pNIAFUE7gZsN2uE75LmpzAWin21G7lLPcPL2k4FJVd8an1HiP2WmscJU6U89fOfMb2viObnKcCzebozBCmKGtHEuXZo9FcReOx49AnQSpmESJGs+q2dL/FApkTjQiyT4J6O5dJpoww0/r57Wx0cmmqjETKBb5rSgXM51Etk3wO09mvcPHsEwrT7qH8r9XWdyCDoEn7FCLX3/LYnf/D4SmZ633YPl5gv3v9XEwxR5+04akjgnvWDSNIaDbWBdxHNb7l4pMc+WR1bwCyMyA7KXj0RrftEGOrm9ZRLe6BkbT4cycA+j77nbPOMcyZChliV9pPQos+4TOJoTzcK2L8yWVoY409aDNVuAjdP6Yum0R2maBGl/etLmIMpJC35C5/lZ+dUNjJAM= diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index b70999c72..8025ccb8f 100644 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh @@ -20,7 +20,8 @@ increment_version () NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | wc -l) if [[ $NEFM -gt 0 ]] ; then echo "Essential files modified." - lasttag=$(git tag | grep -Ev '\-' | head -1) + git fetch --tags + lasttag=$(git tag | grep -Ev '\-' | xargs -I@ git log --format=format:"%ai @%n" -1 @ | sort | awk '{print $4}' | tail -1) newtag=$(increment_version $lasttag) git tag $newtag git push --tags -q https://$GH_TOKEN@github.com/qmk/qmk_firmware -- cgit v1.2.3 From 19d63ad72c012ee3dfb9375724067b278593df8a Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Tue, 7 Feb 2017 01:35:10 -0500 Subject: try building only keyboards needed --- .travis.yml | 6 ++---- util/travis_build.sh | 18 ++++++++++++++++++ util/travis_compiled_push.sh | 6 +++--- 3 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 util/travis_build.sh (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 792f2cd05..093f13be6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,9 +9,6 @@ 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 before_install: - wget http://www.atmel.com/images/avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz install: @@ -20,7 +17,8 @@ install: before_script: - avr-gcc --version script: -- 'if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then make $TARGET AUTOGEN=$AUTOGEN; fi' +- make test AUTOGET=false +- bash util/travis_build.sh addons: apt: packages: diff --git a/util/travis_build.sh b/util/travis_build.sh new file mode 100644 index 000000000..df2e06960 --- /dev/null +++ b/util/travis_build.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +TRAVIS_COMMIT_MESSAGE="${TRAVIS_COMMIT_MESSAGE:-none}" +TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}" + +if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then + NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | wc -l) + if [[ $NEFM -gt 0 ]] ; then + echo "Making all keymaps for all keyboards" + make all-keyboards AUTOGEN=true + else + MKB=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -oP '(?<=keyboards\/)([a-zA-Z_]+)' | sort -u) + for KB in $MKB ; do + echo "Making all keymaps for $KB" + make "$KB" AUTOGEN=true + done + fi +fi diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index 3751da1e5..6ec558cac 100644 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh @@ -38,9 +38,9 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then git clone https://$GH_TOKEN@github.com/jackhumbert/qmk.fm.git cd qmk.fm git submodule update --init --recursive - rm -rf keyboard - rm -rf keyboards - cp -r ../qmk_firmware/keyboards . + #rm -rf keyboard + #rm -rf keyboards + yes | cp -rf ../qmk_firmware/keyboards . mkdir keyboards/ergodox_ez/ cp ../qmk_firmware/util/ergodox_ez.html keyboards/ergodox_ez/index.html cp ../qmk_firmware/readme.md qmk_readme.md -- cgit v1.2.3 From c8d5376f11642aaaae9a247287db30d5b226c3b9 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Tue, 7 Feb 2017 01:54:58 -0500 Subject: fix typo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 093f13be6..ebd4cc182 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ install: before_script: - avr-gcc --version script: -- make test AUTOGET=false +- make test AUTOGEN=false - bash util/travis_build.sh addons: apt: -- cgit v1.2.3 From 6a92cc28977ff4d51fa0bafcb757867b27ebdb45 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Tue, 7 Feb 2017 02:00:07 -0500 Subject: correctly assign bash variable --- .travis.yml | 2 +- util/travis_build.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index ebd4cc182..28f01ecb0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ install: before_script: - avr-gcc --version script: -- make test AUTOGEN=false +- make test AUTOGEN="false" - bash util/travis_build.sh addons: apt: diff --git a/util/travis_build.sh b/util/travis_build.sh index df2e06960..38c1ffc65 100644 --- a/util/travis_build.sh +++ b/util/travis_build.sh @@ -7,12 +7,12 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | wc -l) if [[ $NEFM -gt 0 ]] ; then echo "Making all keymaps for all keyboards" - make all-keyboards AUTOGEN=true + make all-keyboards AUTOGEN="true" else MKB=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -oP '(?<=keyboards\/)([a-zA-Z_]+)' | sort -u) for KB in $MKB ; do echo "Making all keymaps for $KB" - make "$KB" AUTOGEN=true + make "$KB" AUTOGEN="true" done fi fi -- cgit v1.2.3 From 616b8604b0b0f7e281ecfeff385d96a6a14955da Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Tue, 7 Feb 2017 11:53:43 -0500 Subject: variable scope fix for travis --- .travis.yml | 6 ++---- util/travis_build.sh | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 28f01ecb0..18ecde7e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ install: before_script: - avr-gcc --version script: -- make test AUTOGEN="false" +- make test AUTOGEN=false - bash util/travis_build.sh addons: apt: @@ -29,6 +29,4 @@ addons: - libnewlib-arm-none-eabi - diffutils after_success: - if [ "$AUTOGEN" == "true" ]; then - bash util/travis_compiled_push.sh; - fi + bash util/travis_compiled_push.sh diff --git a/util/travis_build.sh b/util/travis_build.sh index 38c1ffc65..fab9178de 100644 --- a/util/travis_build.sh +++ b/util/travis_build.sh @@ -12,7 +12,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then MKB=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -oP '(?<=keyboards\/)([a-zA-Z_]+)' | sort -u) for KB in $MKB ; do echo "Making all keymaps for $KB" - make "$KB" AUTOGEN="true" + make "$KB" AUTOGEN=true done fi fi -- cgit v1.2.3 From a773124537a09679e905e7497ab73fe2808fced1 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Sun, 12 Feb 2017 12:23:03 -0500 Subject: send travis stuff to gitter --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 18ecde7e3..6c26e4112 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,3 +30,10 @@ addons: - diffutils after_success: bash util/travis_compiled_push.sh +notifications: + webhooks: + urls: + - https://webhooks.gitter.im/e/cca31de3d44b9adb617b + on_success: change # options: [always|never|change] default: always + on_failure: always # options: [always|never|change] default: always + on_start: never # options: [always|never|change] default: always \ No newline at end of file -- cgit v1.2.3