From 528bfe316d2211eea6270b815ea28d93b6676519 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yao=20Wei=20Tjong=20=E5=A7=9A=E4=BC=9F=E5=BF=A0?= Date: Tue, 12 Aug 2014 12:05:21 +0800 Subject: [PATCH] For Travis CI - use single process when building samples for MinGW. --- Rakefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Rakefile b/Rakefile index a099388eb..b65750818 100644 --- a/Rakefile +++ b/Rakefile @@ -268,11 +268,9 @@ def makefile_travis_ci else platform_prefix = '' end - # Temporary workaround due to Travis-CI insufficient memory in 64-bit/MinGW/STATIC build configuration, build samples separately using less worker processes + # Temporary workaround due to Travis-CI insufficient memory in 64-bit/MinGW/STATIC build configuration, build samples separately using single worker process if ENV['CI'] and ENV['WINDOWS'] and ENV['URHO3D_64BIT'] and ENV['URHO3D_LIB_TYPE'] == 'STATIC' - system "cd #{platform_prefix}Build/Tools && make -j$NUMJOBS" or abort 'Failed to build or test Urho3D library and/or tools' - numjobs = [ENV['NUMJOBS'].to_i - 1, 1].max - system "cd #{platform_prefix}Build && make -j#{numjobs}" or abort 'Failed to build Urho3D samples' + system "cd #{platform_prefix}Build/Tools && make -j$NUMJOBS && cd .. && make" or abort 'Failed to build or test Urho3D library' else # Only 64-bit Linux environment with virtual framebuffer X server support and not MinGW build; or OSX build environment are capable to run tests if $testing == 1 and (ENV['URHO3D_64BIT'] and ENV['WINDOWS'].to_i != 1 or ENV['OSX'])