From d6aa1b9ad6413895cd61574324841697f31e3f29 Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Sat, 16 Jun 2018 05:37:17 +0800 Subject: [PATCH 1/3] limit Android NDK jobs for ReactAndroid on CI --- ReactAndroid/build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle index 601071cdec1f..61f3539d8b0b 100644 --- a/ReactAndroid/build.gradle +++ b/ReactAndroid/build.gradle @@ -18,6 +18,7 @@ import org.apache.tools.ant.filters.ReplaceTokens def customDownloadsDir = System.getenv("REACT_NATIVE_DOWNLOADS_DIR") def downloadsDir = customDownloadsDir ? new File(customDownloadsDir) : new File("$buildDir/downloads") +def ndkJobs = System.getenv("BUILD_THREADS") def thirdPartyNdkDir = new File("$buildDir/third-party-ndk") // You need to have following folders in this directory: @@ -221,7 +222,7 @@ task buildReactNdkLib(dependsOn: [prepareJSC, prepareBoost, prepareDoubleConvers "THIRD_PARTY_NDK_DIR=$buildDir/third-party-ndk", "REACT_COMMON_DIR=$projectDir/../ReactCommon", '-C', file('src/main/jni/react/jni').absolutePath, - '--jobs', project.hasProperty("jobs") ? project.property("jobs") : Runtime.runtime.availableProcessors() + '--jobs', ndkJobs ?: project.hasProperty("jobs") ? project.property("jobs") : Runtime.runtime.availableProcessors() } task cleanReactNdkLib(type: Exec) { From 7532a973ea479e5d23ed3a74a9db31b655b73f72 Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Sat, 16 Jun 2018 14:50:03 +0800 Subject: [PATCH 2/3] Revert "limit Android NDK jobs for ReactAndroid on CI" --- ReactAndroid/build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle index 61f3539d8b0b..601071cdec1f 100644 --- a/ReactAndroid/build.gradle +++ b/ReactAndroid/build.gradle @@ -18,7 +18,6 @@ import org.apache.tools.ant.filters.ReplaceTokens def customDownloadsDir = System.getenv("REACT_NATIVE_DOWNLOADS_DIR") def downloadsDir = customDownloadsDir ? new File(customDownloadsDir) : new File("$buildDir/downloads") -def ndkJobs = System.getenv("BUILD_THREADS") def thirdPartyNdkDir = new File("$buildDir/third-party-ndk") // You need to have following folders in this directory: @@ -222,7 +221,7 @@ task buildReactNdkLib(dependsOn: [prepareJSC, prepareBoost, prepareDoubleConvers "THIRD_PARTY_NDK_DIR=$buildDir/third-party-ndk", "REACT_COMMON_DIR=$projectDir/../ReactCommon", '-C', file('src/main/jni/react/jni').absolutePath, - '--jobs', ndkJobs ?: project.hasProperty("jobs") ? project.property("jobs") : Runtime.runtime.availableProcessors() + '--jobs', project.hasProperty("jobs") ? project.property("jobs") : Runtime.runtime.availableProcessors() } task cleanReactNdkLib(type: Exec) { From b5dda9af39d281d2164e6300182a6c02c93eb4de Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Sat, 16 Jun 2018 14:51:07 +0800 Subject: [PATCH 3/3] pass -Pjobs=$BUILD_THREADS to RNTester on CI --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1985e9c89de4..2a459a0ba775 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -569,7 +569,7 @@ jobs: - run: name: Build Android RNTester command: | - ./gradlew RNTester:android:app:assembleRelease + ./gradlew RNTester:android:app:assembleRelease -Pjobs=$BUILD_THREADS # Collect Results - run: *collect-android-test-results