From 3d603811075a27bf2c1ef0f844d7ece2d7d9ad33 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Tue, 18 Jun 2019 17:44:11 +0300 Subject: [PATCH] - updated Travis CI configuration Added GCC 9 Updated to Clang 8 Moved Windows targets to trigger them earlier --- .travis.yml | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index d514c268f..48ce4cfdf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,14 @@ matrix: env: - CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9" + - os: windows + env: + - CMAKE_OPTIONS="-A Win32" + + - os: windows + env: + - CMAKE_OPTIONS="-A x64" + - os: linux compiler: gcc env: @@ -86,18 +94,31 @@ matrix: - libsdl2-dev - libgtk-3-dev + - os: linux + compiler: gcc + env: + - GCC_VERSION=9 + - CMAKE_OPTIONS="-DCMAKE_CXX_FLAGS=-Wno-implicit-fallthrough" + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-9 + - libsdl2-dev + - os: linux compiler: clang env: - - CLANG_VERSION=7 + - CLANG_VERSION=8 - CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=MinSizeRel -DDYN_OPENAL=NO -DDYN_SNDFILE=NO -DDYN_MPG123=NO -DDYN_FLUIDSYNTH=NO" addons: apt: sources: - ubuntu-toolchain-r-test - - llvm-toolchain-xenial-7 + - llvm-toolchain-xenial-8 packages: - - clang-7 + - clang-8 - libsdl2-dev - libgme-dev - libopenal-dev @@ -106,14 +127,6 @@ matrix: - libfluidsynth-dev - libgtk-3-dev - - os: windows - env: - - CMAKE_OPTIONS="-A Win32" - - - os: windows - env: - - CMAKE_OPTIONS="-A x64" - before_install: - if [ -n "$GCC_VERSION" ]; then export CC="gcc-${GCC_VERSION}" CXX="g++-${GCC_VERSION}"; fi - if [ -n "$CLANG_VERSION" ]; then export CC="clang-${CLANG_VERSION}" CXX="clang++-${CLANG_VERSION}"; fi