Create a matrix of jobs for easier configuration testing

Right now it will post two jobs, one regular and the other one
with network disabled, so both get tested on future commits.
This commit is contained in:
Michał Janiszewski 2015-09-18 12:01:00 +02:00
parent 5358b566fe
commit b4a9132105
2 changed files with 6 additions and 18 deletions

View File

@ -15,6 +15,10 @@ cache:
- cache
apt: true
env:
- OPENRCT2_CMAKE_OPTS=
- OPENRCT2_CMAKE_OPTS="-DDISABLE_NETWORK=ON"
sudo: required
services:

View File

@ -2,23 +2,12 @@
set -e
nonet=false;
if [[ "$1" = "--include-nonet" ]]; then
nonet=true
fi
cachedir=.cache
mkdir -p $cachedir
if [[ ! -d build ]]; then
mkdir -p build
fi
if [[ $nonet = true ]]; then
if [[ ! -d build_nonet ]]; then
mkdir -p build_nonet
fi
fi
libversion=2
libVFile="./libversion"
@ -66,15 +55,10 @@ if [[ "$needsdownload" = "true" ]]; then
fi
pushd build
cmake -DCMAKE_TOOLCHAIN_FILE=../CMakeLists_mingw.txt -DCMAKE_BUILD_TYPE=Debug ..
echo OPENRCT2_CMAKE_OPTS = $OPENRCT_CMAKE_OPTS
cmake -DCMAKE_TOOLCHAIN_FILE=../CMakeLists_mingw.txt -DCMAKE_BUILD_TYPE=Debug $OPENRCT2_CMAKE_OPTS ..
make
popd
if [[ $nonet = true ]]; then
pushd build_nonet
cmake -DCMAKE_TOOLCHAIN_FILE=../CMakeLists_mingw.txt -DCMAKE_BUILD_TYPE=Debug -DDISABLE_NETWORK=ON ..
make
popd
fi
if [[ ! -h openrct2.dll ]]; then
ln -s build/openrct2.dll openrct2.dll