Skip to content
Permalink
Browse files

travis,appveyor: fixes and improvements

  • Loading branch information...
illwieckz committed Jul 7, 2019
1 parent fdfdbc5 commit 406deb3033bd27565b2209b3209e110824f3823f
Showing with 11 additions and 12 deletions.
  1. +2 −4 appveyor.yml → .appveyor.yml
  2. +9 −8 .travis.yml
@@ -40,9 +40,7 @@ before_build:

build_script:
- cmd: cmake --version
- cmd: mkdir build
- cmd: cd build
- cmd: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
- cmd: cmake -DUSE_PRECOMPILED_HEADER=0 -DUSE_WERROR=1 -DBE_VERBOSE=1 -G "NMake Makefiles"
-DBUILD_CLIENT=0 -DBUILD_TTY_CLIENT=0 -DBUILD_SERVER=0 -DBUILD_GAME_NACL=0 -DCMAKE_BUILD_TYPE=Debug ..
- cmd: cmake --build .
-DBUILD_CLIENT=0 -DBUILD_TTY_CLIENT=0 -DBUILD_SERVER=0 -DBUILD_GAME_NACL=0 -DCMAKE_BUILD_TYPE=Debug -H. -Bbuild
- cmd: cmake --build build
@@ -26,12 +26,12 @@ matrix:
os: linux
compiler: clang
env: MODE=2
- name: "osx game-native-dll (clang)"
- name: "macOS game-native-dll (clang)"
os: osx
compiler: clang
env: MODE=1
allow_failures:
- name: "osx nacl-nexe (pnacl-clang)"
- name: "macOS nacl-nexe (pnacl-clang)"
os: osx
compiler: clang
env: MODE=2
@@ -42,10 +42,11 @@ install:
sudo apt-get -y -q --no-install-recommends install
zlib1g-dev libncursesw5-dev
nettle-dev libfreetype6-dev
liblua5.2-dev;
liblua5.2-dev
ninja-build python-yaml python-jinja2;
fi
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then
sudo apt-get -y -q --no-install-recommends install ninja-build python-yaml python-jinja2;
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then
brew install ccache ninja;
fi
- |
# workarounds to make ccache work
@@ -59,7 +60,6 @@ install:

before_script:
- ccache --zero-stats
- mkdir -p build && cd build
# In older versions of gcc the missing field initializer warning fires even when the initialization list is empty, which is stupid.
# This issue is fixed in version 5 of gcc, so if we get a newer version on Travis the warning can be re-enabled.
- if [ "$CC" == "gcc" ]; then export CXXFLAGS="$CXXFLAGS -Wno-missing-field-initializers"; fi
@@ -70,8 +70,9 @@ script:
-DBUILD_CLIENT=0 -DBUILD_TTY_CLIENT=0 -DBUILD_SERVER=0
-DBUILD_GAME_NATIVE_DLL=$(($MODE == 1)) -DBUILD_GAME_NATIVE_EXE=0
-DBUILD_GAME_NACL=$(($MODE == 2)) -DBUILD_GAME_NACL_NEXE=0
-DUSE_WERROR=1 -DBE_VERBOSE=1 -G "Ninja" -DCMAKE_BUILD_TYPE=Debug -DUSE_DEBUG_OPTIMIZE=0 ..
- cmake --build . -- -j8
-DUSE_WERROR=1 -DBE_VERBOSE=1 -G "Ninja" -DCMAKE_BUILD_TYPE=Debug -DUSE_DEBUG_OPTIMIZE=0
-H. -Bbuild
- cmake --build build -- -j8

before_cache:
- ccache --show-stats

0 comments on commit 406deb3

Please sign in to comment.
You can’t perform that action at this time.