From 26183237ab3344c6a7860e47b069d61133c432d4 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Tue, 14 Nov 2023 04:46:11 +0100 Subject: [PATCH] Make :core:builtins:serialize more remote build cache friendly On CI when populating build cache, the build runs with --info logging level causing an additional jvm argument provided to the task. This argument is usually not provided in local builds. The argument only affects task printout and not its outputs. --- core/builtins/build.gradle.kts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/builtins/build.gradle.kts b/core/builtins/build.gradle.kts index e929aabc42c..0beee01e367 100644 --- a/core/builtins/build.gradle.kts +++ b/core/builtins/build.gradle.kts @@ -82,14 +82,14 @@ fun serializeTask(name: String, sourcesTask: TaskProvider<*>, inDirs: List classpath(rootProject.buildscript.configurations["bootstrapCompilerClasspath"]) mainClass.set("org.jetbrains.kotlin.serialization.builtins.RunKt") - jvmArgs(listOfNotNull( - "-Didea.io.use.nio2=true", - "-Dkotlin.builtins.serializer.log=true".takeIf { logger.isInfoEnabled } - )) + jvmArguments.add("-Didea.io.use.nio2=true") args( pathRelativeToWorkingDir(outDir), *inDirs.map(::pathRelativeToWorkingDir).toTypedArray() ) + doFirst { + if (logger.isInfoEnabled) jvmArguments.add("-Dkotlin.builtins.serializer.log=true") + } } val serialize = serializeTask("serialize", prepareSources, listOf(builtinsSrc, builtinsNative, builtinsCherryPicked, rangesCherryPicked))