customize concurrent JOBS per compiler/platform

This commit is contained in:
Dane Springmeyer
2014-10-30 11:37:10 -04:00
parent e38b02ff58
commit 64f383e3f6
3 changed files with 9 additions and 9 deletions

View File

@@ -5,16 +5,16 @@ matrix:
- os: linux
include:
- os: linux
env: BUILDTYPE=Release
env: BUILDTYPE=Release JOBS=16
compiler: clang
- os: linux
env: BUILDTYPE=Debug
env: BUILDTYPE=Debug JOBS=8
compiler: clang
- os: linux
env: BUILDTYPE=Release
env: BUILDTYPE=Release JOBS=4
compiler: gcc
- os: osx
env: BUILDTYPE=Debug
env: BUILDTYPE=Debug JOBS=4
compiler: clang
env:

View File

@@ -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" \

View File

@@ -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