aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2017-02-07 11:53:43 -0500
committerJack Humbert <jack.humb@gmail.com>2017-02-07 11:53:43 -0500
commit616b8604b0b0f7e281ecfeff385d96a6a14955da (patch)
tree09c30b5478fddf6c36326b21fdd963e82ff8cbb8
parent6a92cc28977ff4d51fa0bafcb757867b27ebdb45 (diff)
downloadqmk_firmware-616b8604b0b0f7e281ecfeff385d96a6a14955da.tar.gz
qmk_firmware-616b8604b0b0f7e281ecfeff385d96a6a14955da.zip
variable scope fix for travis
-rw-r--r--.travis.yml6
-rw-r--r--util/travis_build.sh2
2 files changed, 3 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 28f01ecb0..18ecde7e3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ install:
17before_script: 17before_script:
18 - avr-gcc --version 18 - avr-gcc --version
19script: 19script:
20- make test AUTOGEN="false" 20- make test AUTOGEN=false
21- bash util/travis_build.sh 21- bash util/travis_build.sh
22addons: 22addons:
23 apt: 23 apt:
@@ -29,6 +29,4 @@ addons:
29 - libnewlib-arm-none-eabi 29 - libnewlib-arm-none-eabi
30 - diffutils 30 - diffutils
31after_success: 31after_success:
32 if [ "$AUTOGEN" == "true" ]; then 32 bash util/travis_compiled_push.sh
33 bash util/travis_compiled_push.sh;
34 fi
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
12 MKB=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -oP '(?<=keyboards\/)([a-zA-Z_]+)' | sort -u) 12 MKB=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -oP '(?<=keyboards\/)([a-zA-Z_]+)' | sort -u)
13 for KB in $MKB ; do 13 for KB in $MKB ; do
14 echo "Making all keymaps for $KB" 14 echo "Making all keymaps for $KB"
15 make "$KB" AUTOGEN="true" 15 make "$KB" AUTOGEN=true
16 done 16 done
17 fi 17 fi
18fi 18fi