Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

travis,appveyor: fixes and improvements #1115

Merged
merged 1 commit into from Jul 7, 2019
Merged

travis,appveyor: fixes and improvements #1115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 2 additions & 4 deletions appveyor.yml → .appveyor.yml
View file
Open in desktop
Expand Up @@ -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
17 changes: 9 additions & 8 deletions .travis.yml
View file
Open in desktop
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down