diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-05-30 11:46:25 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2017-05-30 11:46:25 -0400 |
| commit | 7eccbfe73764dbac0c33065394a8b86c4952eabf (patch) | |
| tree | 4cbbfae8251dbd14ab287540e81d7f32f0baa3d5 | |
| parent | 0c351fa98bff6a2e9d3ff30cc19d6b0782b85a62 (diff) | |
exclude PRs
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | util/travis_compiled_push.sh | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index ab788317c8..6c26e41128 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,6 @@ env: - secure: vBTSL34BDPxDilKUuTXqU4CJ26Pv5hogD2nghatkxSQkI1/jbdnLj/DQdPUrMJFDIY6TK3AltsBx72MaMsLQ1JO/Ou24IeHINHXzUC1FlS9yQa48cpxnhX5kzXNyGs3oa0qaFbvnr7RgYRWtmD52n4bIZuSuW+xpBv05x2OCizdT2ZonH33nATaHGFasxROm4qYZ241VfzcUv766V6RVHgL4x9V08warugs+RENVkfzxxwhk3NmkrISabze0gSVJLHBPHxroZC6EUcf/ocobcuDrCwFqtEt90i7pNIAFUE7gZsN2uE75LmpzAWin21G7lLPcPL2k4FJVd8an1HiP2WmscJU6U89fOfMb2viObnKcCzebozBCmKGtHEuXZo9FcReOx49AnQSpmESJGs+q2dL/FApkTjQiyT4J6O5dJpoww0/r57Wx0cmmqjETKBb5rSgXM51Etk3wO09mvcPHsEwrT7qH8r9XWdyCDoEn7FCLX3/LYnf/D4SmZ633YPl5gv3v9XEwxR5+04akjgnvWDSNIaDbWBdxHNb7l4pMc+WR1bwCyMyA7KXj0RrftEGOrm9ZRLe6BkbT4cycA+j77nbPOMcyZChliV9pPQos+4TOJoTzcK2L8yWVoY409aDNVuAjdP6Yum0R2maBGl/etLmIMpJC35C5/lZ+dUNjJAM= before_install: - wget http://www.atmel.com/images/avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz - - openssl aes-256-cbc -K $encrypted_b0ee987fd0fc_key -iv $encrypted_b0ee987fd0fc_iv -in secrets.tar.enc -out secrets.tar -d - - tar xvf secrets.tar 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" diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index 853795369f..2f5f74f93e 100644 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh @@ -4,16 +4,18 @@ set -o errexit -o nounset rev=$(git rev-parse --short HEAD) +if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then + git config --global user.name "Travis CI" git config --global user.email "jack.humb+travis.ci@gmail.com" +openssl aes-256-cbc -K $encrypted_b0ee987fd0fc_key -iv $encrypted_b0ee987fd0fc_iv -in secrets.tar.enc -out secrets.tar -d +tar xvf secrets.tar + chmod 600 id_rsa_qmk_firmware chmod 600 qmk.fm eval `ssh-agent -s` ssh-add id_rsa_qmk_firmware -ssh-add qmk.fm - -if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then increment_version () { @@ -42,6 +44,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then cd .. git clone git@github.com:qmk/qmk.fm.git cd qmk.fm + ssh-add ../qmk_firmware/qmk.fm #git submodule update --init --recursive #rm -rf keyboard #rm -rf keyboards |