Skip to content

Commit

Permalink
Travis CI: use make to build
Browse files Browse the repository at this point in the history
  • Loading branch information
antiagainst committed Oct 13, 2017
1 parent 16f8253 commit 259ca18
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,9 @@ addons:
apt:
packages:
- clang-3.6
- ninja-build
- lcov

before_install:
# Install ninja on macOS.
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ninja; fi
- if [[ "$BUILD_NDK" == "ON" ]]; then
git clone --depth=1 https://github.com/urho3d/android-ndk.git $HOME/android-ndk;
export ANDROID_NDK=$HOME/android-ndk;
Expand Down Expand Up @@ -80,19 +77,17 @@ script:
-DANDROID_NATIVE_API_LEVEL=android-9
-DCMAKE_BUILD_TYPE=Release
-DANDROID_ABI="armeabi-v7a with NEON"
-DSHADERC_SKIP_TESTS=ON
-GNinja ..;
-DSHADERC_SKIP_TESTS=ON ..;
else
cmake -DCMAKE_BUILD_TYPE=${SHADERC_BUILD_TYPE:-Debug}
-DENABLE_CODE_COVERAGE=${SHADERC_CODE_COVERAGE:-OFF}
-GNinja ..;
-DENABLE_CODE_COVERAGE=${SHADERC_CODE_COVERAGE:-OFF} ..;
fi
- ninja
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
export NPROC=`nproc`;
else
export NPROC=`sysctl -n hw.ncpu`;
fi
- make -j${NPROC}
- if [[ "$BUILD_NDK" != "ON" ]]; then ctest -j${NPROC} --output-on-failure; fi

after_success:
Expand Down

0 comments on commit 259ca18

Please sign in to comment.