diff options
| author | Cody Northrop <cnorthrop@google.com> | 2017-10-31 13:39:32 -0600 |
|---|---|---|
| committer | Cody Northrop <cnorthrop@google.com> | 2017-11-03 16:03:59 -0600 |
| commit | 4d90e38ba0a5bef4d864ec662b8bb5f66559b8d5 (patch) | |
| tree | 83602987c3616b962a8b0c6abe6b66bf27c452b6 | |
| parent | d1af17bfd7512532adc29a05ca4c519df29003fc (diff) | |
| download | usermoji-4d90e38ba0a5bef4d864ec662b8bb5f66559b8d5.tar.xz | |
travis: Use multiple cores for build
| -rw-r--r-- | .travis.yml | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index a9ff353f..00afe0df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,13 +26,6 @@ matrix: compiler: clang env: VULKAN_BUILD_TARGET=LINUX -android: - components: - - tools - - platform-tools - - build-tools-23.0.2 - - android-23 - cache: ccache before_install: @@ -47,18 +40,17 @@ before_install: - if [[ "$VULKAN_BUILD_TARGET" == "ANDROID" ]]; then export JAVA_HOME="/usr/lib/jvm/java-8-oracle"; fi - if [[ "$VULKAN_BUILD_TARGET" == "ANDROID" ]]; then export PATH="$ANDROID_NDK_HOME:$PATH"; fi - # Clear the toolchain contents if revisions have changed - - ./scripts/check_toolchain_revisions.sh + - export core_count=$(nproc || echo 4) && echo core_count = $core_count script: - if [[ "$VULKAN_BUILD_TARGET" == "LINUX" ]]; then ./update_external_sources.sh; fi - if [[ "$VULKAN_BUILD_TARGET" == "LINUX" ]]; then cmake -H. -Bdbuild -DCMAKE_BUILD_TYPE=Debug; fi - - if [[ "$VULKAN_BUILD_TARGET" == "LINUX" ]]; then make -C dbuild; fi + - if [[ "$VULKAN_BUILD_TARGET" == "LINUX" ]]; then make -C dbuild -j $core_count; fi - if [[ "$VULKAN_BUILD_TARGET" == "LINUX" ]]; then LD_LIBRARY_PATH=dbuild/loader:$LD_LIBRARY_PATH VK_LAYER_PATH=dbuild/layers VK_ICD_FILENAMES=dbuild/icd/VkICD_mock_icd.json dbuild/tests/vk_layer_validation_tests; fi - if [[ "$VULKAN_BUILD_TARGET" == "ANDROID" ]]; then pushd build-android; fi - if [[ "$VULKAN_BUILD_TARGET" == "ANDROID" ]]; then ./update_external_sources_android.sh --abi $ANDROID_ABI --no-build; fi - if [[ "$VULKAN_BUILD_TARGET" == "ANDROID" ]]; then ./android-generate.sh; fi - - if [[ "$VULKAN_BUILD_TARGET" == "ANDROID" ]]; then USE_CCACHE=1 NDK_CCACHE=/usr/lib/ccache ndk-build APP_ABI=$ANDROID_ABI; fi + - if [[ "$VULKAN_BUILD_TARGET" == "ANDROID" ]]; then USE_CCACHE=1 NDK_CCACHE=ccache ndk-build APP_ABI=$ANDROID_ABI -j $core_count; fi - if [[ "$VULKAN_BUILD_TARGET" == "ANDROID" ]]; then popd; fi notifications: |