diff options
| author | Dane Springmeyer <dane@mapbox.com> | 2014-10-30 11:37:10 -0400 |
|---|---|---|
| committer | Dane Springmeyer <dane@mapbox.com> | 2014-10-30 11:37:10 -0400 |
| commit | 64f383e3f67ff54da2ef68c549bef7dd9d0eb5d1 (patch) | |
| tree | 0a638d4b7b01acd70d84f9b24db1c0c24718221d /scripts | |
| parent | e38b02ff5897ef4bfd3666171f944213a256dd74 (diff) | |
| download | qtlocation-mapboxgl-64f383e3f67ff54da2ef68c549bef7dd9d0eb5d1.tar.gz | |
customize concurrent JOBS per compiler/platform
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/travis_before_install.sh | 2 | ||||
| -rwxr-xr-x | scripts/travis_script.sh | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh index cdeb63d972..f67aa270d6 100755 --- a/scripts/travis_before_install.sh +++ b/scripts/travis_before_install.sh @@ -40,7 +40,7 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then echo $CXXFLAGS echo $CFLAGS echo $LDFLAGS - make -j4 && sudo make install && \ + make -j$JOBS && sudo make install && \ cd ../ mapbox_time "install_opengl" \ diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh index 8e2f921638..d301c0efd3 100755 --- a/scripts/travis_script.sh +++ b/scripts/travis_script.sh @@ -8,10 +8,10 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then # build & test Linux # mapbox_time "compile_program" \ - make linux -j$(nproc) BUILDTYPE=${BUILDTYPE} + make linux -j$JOBS BUILDTYPE=${BUILDTYPE} mapbox_time "compile_tests" \ - make test -j$(nproc) BUILDTYPE=${BUILDTYPE} + make test -j$JOBS BUILDTYPE=${BUILDTYPE} mapbox_time "run_tests" \ ./scripts/run_tests.sh @@ -34,7 +34,7 @@ elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then make xproj-cli mapbox_time "build_osx" \ - xcodebuild -project ./build/macosx/mapboxgl-app.xcodeproj -jobs 4 + xcodebuild -project ./build/macosx/mapboxgl-app.xcodeproj -jobs $JOBS # # build iOS @@ -48,5 +48,5 @@ elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then make iproj-cli mapbox_time "build_ios" \ - xcodebuild -project ./build/ios/mapbox-gl-cocoa/app/mapboxgl-app.xcodeproj -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO -jobs 4 + xcodebuild -project ./build/ios/mapbox-gl-cocoa/app/mapboxgl-app.xcodeproj -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO -jobs $JOBS fi |