diff options
| author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-04-09 23:51:55 +0200 |
|---|---|---|
| committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-04-18 14:44:55 +0200 |
| commit | 9b658d10124eb9c43816c380d09d1254a4ebc263 (patch) | |
| tree | 0191cf969ba1634296ba98e070dfd35a6e3bd4e4 /.travis.yml | |
| parent | cfc41426326019c8afe868b3a1105ee1cbbacb88 (diff) | |
| parent | 1735f6016e98c573ed885d1eb7e7cb53b2919f8e (diff) | |
Merge branch 'master' of github.com:mixxxdj/mixxx into migrate-to-QJSEngine
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index b420120752..1f773cd501 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: xenial 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: xenial language: python python: 3.7 cache: @@ -52,10 +54,8 @@ jobs: addons: [] - name: Ubuntu/gcc/SCons build - os: linux - dist: xenial compiler: gcc - # Ubuntu Xenial build prerequisites + # Ubuntu Bionic build prerequisites before_install: - sudo apt-get install -y scons install: @@ -67,11 +67,9 @@ jobs: - ./mixxx-test - name: Ubuntu/gcc/CMake build - os: linux - dist: xenial compiler: gcc cache: ccache - # Ubuntu Xenial build prerequisites + # Ubuntu Bionic build prerequisites env: CMAKEFLAGS_EXTRA="-DLOCALECOMPARE=ON" before_install: - export CMAKE_BUILD_PARALLEL_LEVEL="$(nproc)" |