mirror of
https://github.com/facebook/react-native.git
synced 2026-11-18 20:19:07 +00:00
Gradle Configuration Cache - Round 2 (#49438)
Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/49438 This is the second part of a series of diff needed to enable G. Configuration Cache: https://docs.gradle.org/current/userguide/configuration_cache.html as it will make our CI faster (and will be the default in the future Gradle version). Here I'm making the exec tasks CC friendly. The problem is that previously we were using explicit streams which are not CC friendly for stderr/stdout. The solution is to create a custom task and handle files as input properties. Changelog: [Internal] [Changed] - Reviewed By: cipolleschi Differential Revision: D69662246 fbshipit-source-id: ad7e82e52b12d508ee15b68408882fdc3516d287
This commit is contained in:
1 parent
e8b7772dc9
commit
0014265795
3 files changed
+83
-6
No files matched your search
+44
@@ -0,0 +1,44 @@
|
||||
/*
|
||||
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||
*
|
||||
* This source code is licensed under the MIT license found in the
|
||||
* LICENSE file in the root directory of this source tree.
|
||||
*/
|
||||
|
||||
package com.facebook.react.tasks.internal
|
||||
|
||||
import java.io.File
|
||||
import java.io.FileOutputStream
|
||||
import org.gradle.api.file.RegularFileProperty
|
||||
import org.gradle.api.provider.Property
|
||||
import org.gradle.api.tasks.Exec
|
||||
import org.gradle.api.tasks.Input
|
||||
import org.gradle.api.tasks.Optional
|
||||
import org.gradle.api.tasks.OutputFile
|
||||
|
||||
/**
|
||||
* A Task that will just expose an Exec-like task and that offers properties to configure the
|
||||
* standard output and error.
|
||||
*/
|
||||
abstract class CustomExecTask : Exec() {
|
||||
|
||||
@get:OutputFile @get:Optional abstract val standardOutputFile: RegularFileProperty
|
||||
|
||||
@get:OutputFile @get:Optional abstract val errorOutputFile: RegularFileProperty
|
||||
|
||||
@get:Input @get:Optional abstract val onlyIfProvidedPathDoesNotExists: Property<String>
|
||||
|
||||
override fun exec() {
|
||||
if (onlyIfProvidedPathDoesNotExists.isPresent &&
|
||||
File(onlyIfProvidedPathDoesNotExists.get()).exists()) {
|
||||
return
|
||||
}
|
||||
if (standardOutputFile.isPresent) {
|
||||
standardOutput = FileOutputStream(standardOutputFile.get().asFile)
|
||||
}
|
||||
if (errorOutputFile.isPresent) {
|
||||
errorOutput = FileOutputStream(errorOutputFile.get().asFile)
|
||||
}
|
||||
super.exec()
|
||||
}
|
||||
}
|
||||
+33
@@ -0,0 +1,33 @@
|
||||
/*
|
||||
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||
*
|
||||
* This source code is licensed under the MIT license found in the
|
||||
* LICENSE file in the root directory of this source tree.
|
||||
*/
|
||||
|
||||
package com.facebook.react.tasks.internal
|
||||
|
||||
import com.facebook.react.tests.createTestTask
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.junit.Rule
|
||||
import org.junit.Test
|
||||
import org.junit.rules.TemporaryFolder
|
||||
|
||||
class CustomExecTaskTest {
|
||||
|
||||
@get:Rule val tempFolder = TemporaryFolder()
|
||||
|
||||
@Test
|
||||
fun customExec_inputProperties_areSetCorrectly() {
|
||||
val outFile = tempFolder.newFile("stdout")
|
||||
val errFile = tempFolder.newFile("stderr")
|
||||
val task =
|
||||
createTestTask<CustomExecTask> { task ->
|
||||
task.errorOutputFile.set(errFile)
|
||||
task.standardOutputFile.set(outFile)
|
||||
}
|
||||
|
||||
assertThat(task.errorOutputFile.get().asFile).isEqualTo(errFile)
|
||||
assertThat(task.standardOutputFile.get().asFile).isEqualTo(outFile)
|
||||
}
|
||||
}
|
||||
@@ -5,8 +5,8 @@
|
||||
* LICENSE file in the root directory of this source tree.
|
||||
*/
|
||||
|
||||
import com.facebook.react.tasks.internal.*
|
||||
import de.undercouch.gradle.tasks.download.Download
|
||||
import java.io.FileOutputStream
|
||||
import org.apache.tools.ant.taskdefs.condition.Os
|
||||
|
||||
plugins {
|
||||
@@ -131,7 +131,7 @@ val installCMake by
|
||||
}
|
||||
|
||||
val configureBuildForHermes by
|
||||
tasks.registering(Exec::class) {
|
||||
tasks.registering(CustomExecTask::class) {
|
||||
dependsOn(installCMake)
|
||||
workingDir(hermesDir)
|
||||
inputs.dir(hermesDir)
|
||||
@@ -149,11 +149,11 @@ val configureBuildForHermes by
|
||||
hermesBuildDir.toString(),
|
||||
"-DJSI_DIR=" + jsiDir.absolutePath,
|
||||
))
|
||||
standardOutput = FileOutputStream("$buildDir/configure-hermesc.log")
|
||||
standardOutputFile.set(project.file("$buildDir/configure-hermesc.log"))
|
||||
}
|
||||
|
||||
val buildHermesC by
|
||||
tasks.registering(Exec::class) {
|
||||
tasks.registering(CustomExecTask::class) {
|
||||
dependsOn(configureBuildForHermes)
|
||||
workingDir(hermesDir)
|
||||
inputs.files(hermesBuildOutputFileTree)
|
||||
@@ -167,8 +167,8 @@ val buildHermesC by
|
||||
"-j",
|
||||
ndkBuildJobs,
|
||||
)
|
||||
standardOutput = FileOutputStream("$buildDir/build-hermesc.log")
|
||||
errorOutput = FileOutputStream("$buildDir/build-hermesc.error.log")
|
||||
standardOutputFile.set(project.file("$buildDir/build-hermesc.log"))
|
||||
errorOutputFile.set(project.file("$buildDir/build-hermesc.error.log"))
|
||||
}
|
||||
|
||||
val prepareHeadersForPrefab by
|
||||
|
||||
Reference in new issue
Block a user