From b4a91321055682bfbe48c49b222d22ed35ded32b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 18 Sep 2015 12:01:00 +0200 Subject: [PATCH] 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. --- .travis.yml | 4 ++++ build.sh | 20 ++------------------ 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6b56fed9be..357b595a0a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,10 @@ cache: - cache apt: true +env: + - OPENRCT2_CMAKE_OPTS= + - OPENRCT2_CMAKE_OPTS="-DDISABLE_NETWORK=ON" + sudo: required services: diff --git a/build.sh b/build.sh index 8ad2585903..6f48556dc1 100755 --- a/build.sh +++ b/build.sh @@ -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