diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2020-03-31 01:58:22 +0200 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2020-03-31 01:58:22 +0200 |
| commit | 69eb11e84f58c5c3e2477b9366a3312266d8c998 (patch) | |
| tree | 43f9805c3c38659cb5600df791663cfc338959ef /.travis.yml | |
| parent | 6e66413614e1f8e5bdd0661bfa1350cea10f35d5 (diff) | |
Simpliy Travis CI config file
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 705a359078..5287e8ede6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,12 @@ -language: cpp +# Enable build config validation (opt-in) +version: ~> 1.0 + +# Default build environment os: linux +dist: bionic +# Default programming language +language: cpp # Build flags common to OS X and Linux. # Parallel builds are important for avoiding OSX build timeouts. @@ -19,8 +25,6 @@ jobs: include: - name: pre-commit if: type != pull_request - os: linux - dist: bionic language: python python: 3.7 # There are too many files in the repo that have formatting issues. We'll @@ -38,8 +42,6 @@ jobs: - name: pre-commit-pr if: type == pull_request - os: linux - dist: bionic language: python python: 3.7 cache: @@ -52,8 +54,6 @@ jobs: addons: [] - name: Ubuntu/gcc/SCons build - os: linux - dist: bionic compiler: gcc # Ubuntu Bionic build prerequisites before_install: @@ -67,8 +67,6 @@ jobs: - ./mixxx-test - name: Ubuntu/gcc/CMake build - os: linux - dist: bionic compiler: gcc cache: ccache # Ubuntu Bionic build prerequisites |