Skip to content

Commit e9af63c

Browse files
authored
ci: experiment with env forwarded to gradlew command
1 parent fc5f9ec commit e9af63c

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

Plugins/JExtractSwiftPlugin/JExtractSwiftPlugin.swift

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,12 @@ struct JExtractSwiftBuildToolPlugin: SwiftJavaPluginProtocol, BuildToolPlugin {
181181
// and that would cause conflicts.
182182
let gradleUserHome = context.pluginWorkDirectoryURL.appending(path: "gradle-user-home")
183183

184+
let GradleUserHome = "GRADLE_USER_HOME"
185+
let gradleUserHomePath = gradleUserHome.path(percentEncoded: false)
186+
log("Prepare command: :SwiftKitCore:build in \(GradleUserHome)=\(gradleUserHomePath)")
187+
var gradlewEnvironment = ProcessInfo.processInfo.environment
188+
gradlewEnvironment[GradleUserHome] = gradleUserHomePath
189+
log("Forward environment: \(gradlewEnvironment)")
184190
commands += [
185191
.buildCommand(
186192
displayName: "Build SwiftKitCore using Gradle (Java)",
@@ -191,9 +197,7 @@ struct JExtractSwiftBuildToolPlugin: SwiftJavaPluginProtocol, BuildToolPlugin {
191197
"--configure-on-demand",
192198
"--no-daemon"
193199
],
194-
environment: [
195-
"GRADLE_USER_HOME": gradleUserHome.path(percentEncoded: false)
196-
],
200+
environment: gradlewEnvironment,
197201
inputFiles: [swiftJavaDirectory],
198202
outputFiles: [swiftKitCoreClassPath]
199203
)

0 commit comments

Comments
 (0)