diff options
| author | Ferran Pujol Camins <ferran.pujol@mytaxi.com> | 2020-03-27 20:30:44 +0100 |
|---|---|---|
| committer | Ferran Pujol Camins <ferran.pujol@mytaxi.com> | 2020-03-27 20:30:44 +0100 |
| commit | 155f0667fb586ce4fcb084b81b9dd837a491e186 (patch) | |
| tree | cabc91a23211748dd8d4413f7d5ad7d70aae6d09 /.travis.yml | |
| parent | 9cdf435dac257e7e4a0598bac9491025b5605e64 (diff) | |
| parent | 78a864081803709ed036771a0a87de0ebd79440b (diff) | |
Merge branch 'master' into migrate-to-QJSEngine
# Conflicts:
# appveyor.yml
# build/depends.py
# res/controllers/midi-components-0.0.js
# src/controllers/controller.h
# src/controllers/controllerengine.h
# src/controllers/engine/colorjsproxy.cpp
# src/controllers/engine/controllerengine.cpp
# src/controllers/hid/hidcontroller.cpp
# src/preferences/dialog/dlgpreferences.cpp
# src/preferences/dialog/dlgpreferences.h
# src/skin/skincontext.cpp
# src/skin/skincontext.h
# src/test/controller_preset_validation_test.cpp
# src/test/controllerengine_test.cpp
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 43 |
1 files changed, 31 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index aeb9cceb9c..b420120752 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ -language: c++ +language: cpp +os: linux # Build flags common to OS X and Linux. @@ -16,21 +17,39 @@ env: jobs: include: - - name: qsscheck + - name: pre-commit + if: type != pull_request os: linux dist: xenial + language: python + python: 3.7 + # There are too many files in the repo that have formatting issues. We'll + # disable these checks for now when pushing directly (but still run these + # on Pull Requests!). + env: SKIP=end-of-file-fixer,trailing-whitespace,clang-format,eslint + cache: + directories: + - $HOME/.cache/pre-commit + before_install: + - pip install pre-commit==2.0.1 + script: + - pre-commit run --all-files + addons: [] + + - name: pre-commit-pr + if: type == pull_request + os: linux + dist: xenial + language: python + python: 3.7 + cache: + directories: + - $HOME/.cache/pre-commit before_install: - - pip3 install tinycss + - pip install pre-commit==2.0.1 script: - - ./scripts/qsscheck.py . - addons: - apt: - packages: - - python3 - - python3-pip - - python3-pyqt5 - - python3-setuptools - - python3-wheel + - pre-commit run --origin HEAD --source origin/HEAD --show-diff-on-failure + addons: [] - name: Ubuntu/gcc/SCons build os: linux |