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 CI: use make to build #397

Merged
merged 1 commit into from
Oct 13, 2017
Merged

Travis CI: use make to build #397

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions .travis.yml
View file
Open in desktop
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