Add additional task inputs for non-cross-compile Go build (#91)

Author: petertrr

gradle-modules/src/main/kotlin/org.sonarsource.cloud-native.go-binary-builder.gradle.kts

@@ -20,13 +20,13 @@ import org.sonarsource.cloudnative.gradle.GO_LICENSES_OUTPUT_DIR
 import org.sonarsource.cloudnative.gradle.GoBuild
 import org.sonarsource.cloudnative.gradle.allGoSourcesAndMakeScripts
 import org.sonarsource.cloudnative.gradle.callMake
+import org.sonarsource.cloudnative.gradle.crossCompileEnv
 import org.sonarsource.cloudnative.gradle.getArchitecture
 import org.sonarsource.cloudnative.gradle.getPlatform
 import org.sonarsource.cloudnative.gradle.goLangCiLintVersion
 import org.sonarsource.cloudnative.gradle.goSources
 import org.sonarsource.cloudnative.gradle.goVersion
 import org.sonarsource.cloudnative.gradle.isCi
-import org.sonarsource.cloudnative.gradle.isCrossCompile
 
 plugins {
     id("org.sonarsource.cloud-native.go-docker-environment")
@@ -61,15 +61,20 @@ if (isCi()) {
         description = "Compile the go code for the local system."
         group = "build"
 
-        inputs.property("GO_CROSS_COMPILE", isCrossCompile)
+        inputs.property("GO_CROSS_COMPILE", crossCompileEnv)
+        if (crossCompileEnv.get() == "0") {
+            // Additional inputs only when not cross-compiling to reuse cached results only from the relevant platform
+            inputs.property("platform", getPlatform())
+            inputs.property("architecture", getArchitecture())
+        }
         inputs.files(allGoSourcesAndMakeScripts())
 
         outputs.dir(GO_BINARY_OUTPUT_DIR)
         outputs.dir(GO_LICENSES_OUTPUT_DIR)
         outputs.files(goBuildExtension.additionalOutputFiles)
         outputs.cacheIf { true }
 
-        environment("GO_CROSS_COMPILE", isCrossCompile.get())
+        environment("GO_CROSS_COMPILE", crossCompileEnv.get())
         callMake("build")
     }
     goBinariesJar.configure { dependsOn(compileGo) }

gradle-modules/src/main/kotlin/org.sonarsource.cloud-native.go-docker-environment.gradle.kts

@@ -19,10 +19,10 @@ import org.sonarsource.cloudnative.gradle.GO_BINARY_OUTPUT_DIR
 import org.sonarsource.cloudnative.gradle.GO_LICENSES_OUTPUT_DIR
 import org.sonarsource.cloudnative.gradle.GoBuild
 import org.sonarsource.cloudnative.gradle.allGoSourcesAndMakeScripts
+import org.sonarsource.cloudnative.gradle.crossCompileEnv
 import org.sonarsource.cloudnative.gradle.goLangCiLintVersion
 import org.sonarsource.cloudnative.gradle.goVersion
 import org.sonarsource.cloudnative.gradle.isCi
-import org.sonarsource.cloudnative.gradle.isCrossCompile
 
 val goBuildExtension = extensions.findByType<GoBuild>() ?: extensions.create<GoBuild>("goBuild")
 
@@ -94,7 +94,7 @@ val dockerTasks = goBuildExtension.dockerCommands.map { tasksToCommands ->
             errorOutput = System.out
 
             inputs.files(allGoSourcesAndMakeScripts())
-            inputs.property("goCrossCompile", isCrossCompile)
+            inputs.property("goCrossCompile", crossCompileEnv)
             outputs.files(goBuildExtension.additionalOutputFiles)
             outputs.dir(GO_BINARY_OUTPUT_DIR)
             outputs.dir(GO_LICENSES_OUTPUT_DIR)

gradle-modules/src/main/kotlin/org/sonarsource/cloudnative/gradle/GoBuild.kt

@@ -53,7 +53,7 @@ val Project.goLangCiLintVersion get() = providers.environmentVariable("GOLANG_CI
     .orElse(providers.gradleProperty("goLangCiLintVersion"))
     .orNull ?: error("Either `GOLANG_CI_LINT_VERSION` env variable or `goLangCiLintVersion` Gradle property must be set")
 
-val Project.isCrossCompile: Provider<String> get() = providers.environmentVariable("GO_CROSS_COMPILE").orElse("0")
+val Project.crossCompileEnv: Provider<String> get() = providers.environmentVariable("GO_CROSS_COMPILE").orElse("0")
 
 fun Project.allGoSourcesAndMakeScripts(): FileTree =
     fileTree(projectDir).matching {