diff --git a/src/main/groovy/se/alipsa/gradle/plugin/release/ModuleReleaseConfigurer.groovy b/src/main/groovy/se/alipsa/gradle/plugin/release/ModuleReleaseConfigurer.groovy index ce51451..2ca3bd0 100644 --- a/src/main/groovy/se/alipsa/gradle/plugin/release/ModuleReleaseConfigurer.groovy +++ b/src/main/groovy/se/alipsa/gradle/plugin/release/ModuleReleaseConfigurer.groovy @@ -65,6 +65,9 @@ final class ModuleReleaseConfigurer { task.dependsOn(extension.guardTask) } extension.guardTask.configure { task -> + // The guard hashes the planned POMs. When staging regenerates them in the same + // build, hash only after regeneration finishes, never a missing or partial file. + task.mustRunAfter(model.call().pomTasks) task.versionsJson.convention(model.call().versionsJson) task.modulePaths.set(paths) task.unpublishedProjectPaths.set(unpublishedPaths) 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..0fe39ba 100644 --- a/src/test/groovy/se/alipsa/gradle/plugin/release/ModuleReleaseTest.groovy +++ b/src/test/groovy/se/alipsa/gradle/plugin/release/ModuleReleaseTest.groovy @@ -221,6 +221,26 @@ if (gradle.startParameter.taskNames == ['help']) { } } + @Test void guardHashesPomsOnlyAfterPomRegenerationFinishes() { + withServer { String base, List requests -> + fixture(base, "modules = [':core']") + // CI regenerated POMs during bundleAll; force that and widen the window in which + // the guard intermittently saw a missing or partially written POM. + new File(root, 'core/build.gradle') << ''' +tasks.named('generatePomFileForMavenPublication') { + outputs.upToDateWhen { false } + doFirst { destination.delete(); Thread.sleep(1500) } +} +''' + commit() + run('releaseAllPlan') + def bundle = run('bundleAll') + assertEquals(org.gradle.testkit.runner.TaskOutcome.SUCCESS, bundle.task(':releaseAllGuard')?.outcome) + assertEquals(org.gradle.testkit.runner.TaskOutcome.SUCCESS, bundle.task(':core:generatePomFileForMavenPublication')?.outcome) + assertTrue(new File(root, BUNDLE).isFile()) + } + } + @Test void namedSubsetPlansBuildsSignsAndBundlesRealPublications() { withServer { String base, List requests -> fixture(base, "modules = [':api', 'core']")