aboutsummaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorWilliam Chang <[email protected]>2019-11-20 22:17:07 -0800
committerWilliam Chang <[email protected]>2019-11-20 22:17:07 -0800
commite7f4d56592b3975c38af329e77b4efd9108495e8 (patch)
tree0a416bccbf70bfdbdb9ffcdb3bf136b47378c014 /.travis.yml
parent71493b2f9bbd5f3d18373c518fa14ccafcbf48fc (diff)
parent8416a94ad27b3ff058576f09f35f0704a8b39ff3 (diff)
downloadqmk_firmware-e7f4d56592b3975c38af329e77b4efd9108495e8.tar.gz
qmk_firmware-e7f4d56592b3975c38af329e77b4efd9108495e8.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml6
1 files changed, 2 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index b4a76765cc..bfac998c11 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
os: linux
dist: trusty
-sudo: required
group: edge
language: c
branches:
@@ -13,12 +12,11 @@ env:
- MAKEFLAGS="-j3 --output-sync"
services:
- docker
-before_install:
- - docker build -t qmkfm/qmk_firmware .
install:
- npm install -g moxygen
script:
- git rev-parse --short HEAD
+ - git diff --name-only HEAD $TRAVIS_BRANCH
- bash util/travis_test.sh
- bash util/travis_build.sh
- bash util/travis_docs.sh
@@ -29,7 +27,7 @@ addons:
- diffutils
- dos2unix
- doxygen
-after_success:
+after_script:
bash util/travis_compiled_push.sh
notifications:
webhooks: