From 9b7884bb2648b8b65bc9ff9b5dcfa0b7daf3b8aa Mon Sep 17 00:00:00 2001 From: Per Nyfelt Date: Sun, 15 Nov 2026 18:38:26 +0100 Subject: [PATCH] Assert guard execution in non-upload evidence regressions --- .../gradle/plugin/release/CombinedReleaseRegistrar.groovy | 4 ++++ .../alipsa/gradle/plugin/release/ModuleReleaseTest.groovy | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/groovy/se/alipsa/gradle/plugin/release/CombinedReleaseRegistrar.groovy b/src/main/groovy/se/alipsa/gradle/plugin/release/CombinedReleaseRegistrar.groovy index ca5deaf..17e81fb 100644 --- a/src/main/groovy/se/alipsa/gradle/plugin/release/CombinedReleaseRegistrar.groovy +++ b/src/main/groovy/se/alipsa/gradle/plugin/release/CombinedReleaseRegistrar.groovy @@ -87,8 +87,12 @@ final class CombinedReleaseRegistrar { if (!release.resumeId.getOrElse('') && release.useExistingBundle.getOrElse(false)) { // Bind upload evidence only for an upload graph, never plain checks/bundling. // This input is retained when the configuration cache stores the resolved graph. + // Keep the cached-graph regressions when upgrading Gradle: this relies on + // task inputs remaining writable during graph configuration. guardTask.get().expectedManifestSha256.set(release.expectedManifestSha256) } + } else { + project.logger.info('Upload evidence ignored: releaseAll not scheduled') } if (graph.hasTask(releasePath) && graph.hasTask(bundlePath)) { ReleaseAllTask release = releaseAllTask.get() diff --git a/src/test/groovy/se/alipsa/gradle/plugin/release/ModuleReleaseTest.groovy b/src/test/groovy/se/alipsa/gradle/plugin/release/ModuleReleaseTest.groovy index a250ae4..cb3bfd9 100644 --- a/src/test/groovy/se/alipsa/gradle/plugin/release/ModuleReleaseTest.groovy +++ b/src/test/groovy/se/alipsa/gradle/plugin/release/ModuleReleaseTest.groovy @@ -8,6 +8,7 @@ import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.ValueSource import java.util.zip.ZipFile import static org.junit.jupiter.api.Assertions.* +import static org.gradle.testkit.runner.TaskOutcome.SUCCESS class ModuleReleaseTest { private static final String BUNDLE = 'build/releaseAll/module-release-fixture-mega-bundle.zip' @@ -707,16 +708,19 @@ nexusReleasePlugin { } @ParameterizedTest - @ValueSource(strings = ['bundleAll', 'releaseAllSigningCheck', 'releaseAllGuard', ':core:check']) + @ValueSource(strings = ['bundleAll', 'releaseAllSigningCheck', 'releaseAllGuard']) void nonUploadGraphsIgnoreExportedUploadEvidence(String task) { withServer { String base, List requests -> existingFixture(base) run('releaseAllPlan') - String[] args = ['-Pexisting', '-Pexpected=not-an-upload-digest', '-PexpectedManifest=not-a-manifest-digest'] + String[] args = ['-Pexisting', '-Pexpected=not-an-upload-digest', '-PexpectedManifest=not-a-manifest-digest', '--info'] def first = run(task, *args) assertNull(first.task(':releaseAll')) + assertEquals(SUCCESS, first.task(':releaseAllGuard')?.outcome) + assertTrue(first.output.contains('Upload evidence ignored: releaseAll not scheduled')) def cached = run(task, *args) assertNull(cached.task(':releaseAll')) + assertEquals(SUCCESS, cached.task(':releaseAllGuard')?.outcome) assertTrue(cached.output.contains('Reusing configuration cache.')) assertFalse(requests.any { it.contains('/publisher/upload') }) }