From 1982c4722fcc51aa87e34cf562672ee4aff540f1 Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Mon, 7 Aug 2023 09:31:35 -0700 Subject: [PATCH] Attempt to enable the Gradle Daemon for CI (#38814) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/38814 This change enables the Gradle Daemon on CI. We noticed some flakyness with the Daemon disabled, so we'll give it a try with the daemon enabled which is the default for Gradle. Changelog: [Internal] [Changed] - Enable the Gradle Daemon for CI Reviewed By: cipolleschi Differential Revision: D48112363 fbshipit-source-id: 4a7f9bbaad33935a97e4e0ea28ea8f2f22c67d0f --- .circleci/config.yml | 5 +---- gradle.properties | 3 --- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 51ebb34199b..460275bccd8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -136,9 +136,7 @@ executors: resource_class: "xlarge" environment: - TERM: "dumb" - - ADB_INSTALL_TIMEOUT: 10 - - GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dfile.encoding=utf-8 -Dorg.gradle.jvmargs="-XX:+HeapDumpOnOutOfMemoryError"' - - BUILD_THREADS: 2 + - GRADLE_OPTS: '-Dfile.encoding=utf-8 -Dorg.gradle.jvmargs="-XX:+HeapDumpOnOutOfMemoryError"' # Repeated here, as the environment key in this executor will overwrite the one in defaults - PUBLIC_ANALYSISBOT_GITHUB_TOKEN_A: *github_analysisbot_token_a - PUBLIC_ANALYSISBOT_GITHUB_TOKEN_B: *github_analysisbot_token_b @@ -1272,7 +1270,6 @@ jobs: - ANDROID_NDK: "C:\\Android\\android-sdk\\ndk\\20.1.5948944" - ANDROID_BUILD_VERSION: 33 - ANDROID_TOOLS_VERSION: 33.0.1 - - GRADLE_OPTS: -Dorg.gradle.daemon=false - CHOCO_CACHE_DIR: "C:\\ChocoCache" steps: - checkout_code_with_cache diff --git a/gradle.properties b/gradle.properties index da451d74340..a0517fc2916 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,3 @@ -# This is causing issue with dependencies task: https://github.com/gradle/gradle/issues/9645#issuecomment-530746758 -# org.gradle.configureondemand=true -org.gradle.daemon=true org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8 org.gradle.parallel=true