zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 23:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- updated Travis CI configuration

Browse source 
Added MSVC 2017 targets because AppVeyor is too slow
Set Linux workers to use Ubuntu 16.04
This commit is contained in:
alexey.lysiuk 2019-02-05 11:59:21 +02:00
parent c026b991ae
commit 2f161a04d9
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
.travis.yml
View file

@ -1,5 +1,5 @@
language: c++ language: cpp
dist: trusty dist: xenial
branches: branches:
except: except:
@ -27,8 +27,6 @@ matrix:
- CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS=-Wno-maybe-uninitialized" - CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS=-Wno-maybe-uninitialized"
addons: addons:
apt: apt:
sources:
- ubuntu-toolchain-r-test
packages: packages:
- g++-4.9 - g++-4.9
- libsdl2-dev - libsdl2-dev
@ -41,8 +39,6 @@ matrix:
- CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS=-Wno-maybe-uninitialized" - CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS=-Wno-maybe-uninitialized"
addons: addons:
apt: apt:
sources:
- ubuntu-toolchain-r-test
packages: packages:
- g++-5 - g++-5
- libsdl2-dev - libsdl2-dev
@ -99,7 +95,7 @@ matrix:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-trusty-7 - llvm-toolchain-xenial-7
packages: packages:
- clang-7 - clang-7
- libsdl2-dev - libsdl2-dev
@ -110,6 +106,14 @@ matrix:
- libfluidsynth-dev - libfluidsynth-dev
- libgtk-3-dev - libgtk-3-dev
- os: windows
env:
- CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -A Win32"
- os: windows
env:
- CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -A x64"
before_install: before_install:
- if [ -n "$GCC_VERSION" ]; then export CC="gcc-${GCC_VERSION}" CXX="g++-${GCC_VERSION}"; fi - 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 - if [ -n "$CLANG_VERSION" ]; then export CC="clang-${CLANG_VERSION}" CXX="clang++-${CLANG_VERSION}"; fi
@ -128,7 +132,8 @@ script:
-DFORCE_INTERNAL_GME=YES \ -DFORCE_INTERNAL_GME=YES \
-DPK3_QUIET_ZIPDIR=YES \ -DPK3_QUIET_ZIPDIR=YES \
.. ..
- make -j2 -k - if [[ $TRAVIS_OS_NAME == 'windows' ]]; then cmake --build . -- -m; fi
- if [[ $TRAVIS_OS_NAME != 'windows' ]]; then cmake --build . -- -j2; fi
notifications: notifications:
email: false email: false