commit db87c5488dd92151b691d51d46247ec54c872a9a
parent a4b9cda31e118d43082ae000299c7a15ef3b6327
Author: triesap <tyson@radroots.org>
Date: Sat, 3 Oct 2026 19:05:37 +0000
build: defer unsupported release checks to task selection
- Keep Linux task listing independent of deferred unsigned release authority
- Reject unsupported release graphs before package or verification tasks run
- Preserve the governed macOS release dependency graph and dry-run guards
- Test Linux configuration cache reuse and unsupported downstream selection
Diffstat:
2 files changed, 62 insertions(+), 28 deletions(-)
diff --git a/build-logic/plugins/src/functionalTest/kotlin/org/harvestcircle/buildlogic/plugins/ConventionPluginSmokeTest.kt b/build-logic/plugins/src/functionalTest/kotlin/org/harvestcircle/buildlogic/plugins/ConventionPluginSmokeTest.kt
@@ -511,33 +511,62 @@ class ConventionPluginSmokeTest {
}
@Test
+ fun linuxPackagingTasksCanBeListedWithReusableStrictConfigurationCache() {
+ val fixture = createTempDirectory("harvestcircle-linux-packaging-tasks-")
+ preparePackagingBuild(fixture, "exit 0")
+ val runner =
+ GradleRunner.create()
+ .withProjectDir(fixture.toFile())
+ .withPluginClasspath()
+ .withArguments(
+ "tasks",
+ "-PnativeOs=Linux",
+ "-PnativeArch=amd64",
+ "--configuration-cache",
+ "--configuration-cache-problems=fail",
+ "--stacktrace",
+ )
+
+ val first = runner.build()
+ assertTrue(first.output.contains("BUILD SUCCESSFUL"), first.output)
+ val second = runner.build()
+ assertTrue(second.output.contains("Reusing configuration cache"), second.output)
+ assertTrue(second.output.contains("BUILD SUCCESSFUL"), second.output)
+ }
+
+ @Test
fun unsignedReleaseReadinessRejectsEveryNonContractPlatformDuringConfiguration() {
listOf(
Triple("linux", "Linux", "aarch64"),
+ Triple("linux-amd64", "Linux", "amd64"),
Triple("macos-x86", "Mac OS X", "x86_64"),
).forEach { (caseName, osName, architecture) ->
val fixture = createTempDirectory("harvestcircle-unsigned-release-$caseName-")
preparePackagingBuild(fixture, "exit 0")
- val result =
- GradleRunner.create()
- .withProjectDir(fixture.toFile())
- .withPluginClasspath()
- .withArguments(
- ":app:desktop:unsignedReleaseReadiness",
- "-PnativeOs=$osName",
- "-PnativeArch=$architecture",
- "--dry-run",
- "--stacktrace",
- ).buildAndFail()
-
- assertTrue(
- result.output.contains(
- "Unsigned release contract requires macOS/aarch64, not $osName/$architecture",
- ),
- result.output,
- )
- assertTrue(result.tasks.none { it.path.startsWith(":app:desktop:") }, result.output)
+ listOf("unsignedReleaseReadiness", "releaseReadiness").forEach { selectedTask ->
+ val result =
+ GradleRunner.create()
+ .withProjectDir(fixture.toFile())
+ .withPluginClasspath()
+ .withArguments(
+ ":app:desktop:$selectedTask",
+ "-PnativeOs=$osName",
+ "-PnativeArch=$architecture",
+ "--dry-run",
+ "--configuration-cache",
+ "--configuration-cache-problems=fail",
+ "--stacktrace",
+ ).buildAndFail()
+
+ assertTrue(
+ result.output.contains(
+ "Unsigned release contract requires macOS/aarch64, not $osName/$architecture",
+ ),
+ result.output,
+ )
+ assertTrue(result.tasks.isEmpty(), result.output)
+ }
}
}
diff --git a/build-logic/plugins/src/main/kotlin/org/harvestcircle/buildlogic/plugins/HarvestCirclePackagingPlugin.kt b/build-logic/plugins/src/main/kotlin/org/harvestcircle/buildlogic/plugins/HarvestCirclePackagingPlugin.kt
@@ -253,17 +253,22 @@ public class HarvestCirclePackagingPlugin : Plugin<Project> {
val notarizationReadiness = target.tasks.register("notarizationReadiness") { it.dependsOn(verifyNotarization) }
val unsignedReleaseReadiness = target.tasks.register("unsignedReleaseReadiness") { task ->
if (!isGovernedMacOsTarget) {
- throw GradleException(
- "Unsigned release contract requires macOS/aarch64, not $nativeOsName/$nativeArchitecture",
+ task.dependsOn(
+ target.providers.provider<List<String>> {
+ throw GradleException(
+ "Unsigned release contract requires macOS/aarch64, not $nativeOsName/$nativeArchitecture",
+ )
+ },
+ )
+ } else {
+ task.dependsOn(
+ "checkLicense",
+ sourceReadiness,
+ packageReadiness,
+ "packageDmg",
+ "verifyMacOsPackage",
)
}
- task.dependsOn(
- "checkLicense",
- sourceReadiness,
- packageReadiness,
- "packageDmg",
- "verifyMacOsPackage",
- )
}
target.tasks.register("releaseReadiness") { task ->
task.dependsOn(