diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-07-02 15:56:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-02 15:56:57 +0200 |
| commit | ae65c610e783e8a4c89aa9c08eab884ba64e644c (patch) | |
| tree | a03df7f918dcadc4780744e622a6c422dff08e02 | |
| parent | e9d624d7ce1d56cf134599a62deea1f5a0848019 (diff) | |
| parent | c8de5760bd5640192f4aa266bc4cb297aa1f4520 (diff) | |
Merge pull request #30250 from marxin/travis-gcc-9
Use GCC 9 in travis.
| -rw-r--r-- | .travis.yml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 09d8cad07e..b52e40200f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,17 +28,17 @@ matrix: packages: - clang-format-8 - - name: Linux editor (debug, GCC 8, with Mono) - env: PLATFORM=x11 TOOLS=yes TARGET=debug CACHE_NAME=${PLATFORM}-tools-mono-gcc-8 MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" EXTRA_ARGS="module_mono_enabled=yes mono_glue=no warnings=extra werror=yes" + - name: Linux editor (debug, GCC 9, with Mono) + env: PLATFORM=x11 TOOLS=yes TARGET=debug CACHE_NAME=${PLATFORM}-tools-mono-gcc-9 MATRIX_EVAL="CC=gcc-9 && CXX=g++-9" EXTRA_ARGS="module_mono_enabled=yes mono_glue=no warnings=extra werror=yes" os: linux - compiler: gcc-8 + compiler: gcc-9 addons: apt: sources: - mono - ubuntu-toolchain-r-test packages: - - &gcc8_deps [gcc-8, g++-8] + - &gcc9_deps [gcc-9, g++-9] - &linux_deps [libasound2-dev, libgl1-mesa-dev, libglu1-mesa-dev, libx11-dev, libxcursor-dev, libxi-dev, libxinerama-dev, libxrandr-dev] - &linux_mono_deps [mono-devel, msbuild, nuget] @@ -75,16 +75,16 @@ matrix: os: osx compiler: clang - - name: Linux headless editor (release_debug, GCC 8) - env: PLATFORM=server TOOLS=yes TARGET=release_debug CACHE_NAME=${PLATFORM}-tools-gcc-8 MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" EXTRA_ARGS="warnings=extra werror=yes" + - name: Linux headless editor (release_debug, GCC 9) + env: PLATFORM=server TOOLS=yes TARGET=release_debug CACHE_NAME=${PLATFORM}-tools-gcc-9 MATRIX_EVAL="CC=gcc-9 && CXX=g++-9" EXTRA_ARGS="warnings=extra werror=yes" os: linux - compiler: gcc-8 + compiler: gcc-9 addons: apt: sources: - ubuntu-toolchain-r-test packages: - - *gcc8_deps + - *gcc9_deps - *linux_deps - name: Linux export template (release_debug, GCC 5, without 3D support) |