diff --git a/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/InternalDistributionDownloadPluginFuncTest.groovy b/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/InternalDistributionDownloadPluginFuncTest.groovy index fc5d432a9ef9a..d27c895aea53b 100644 --- a/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/InternalDistributionDownloadPluginFuncTest.groovy +++ b/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/InternalDistributionDownloadPluginFuncTest.groovy @@ -167,6 +167,11 @@ class InternalDistributionDownloadPluginFuncTest extends AbstractGradleFuncTest } } } + + tasks.named('assemble').configure { + dependsOn buildTar + } + artifacts { it.add("default", buildTar) it.add("extracted", buildExpanded) diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionArchiveSetupPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionArchiveSetupPlugin.java index c2547b72e21fa..7dc6afb28159d 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionArchiveSetupPlugin.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionArchiveSetupPlugin.java @@ -74,6 +74,7 @@ private void registerAndConfigureDistributionArchivesExtension(Project project) project.project(subProjectName, sub -> { sub.getPlugins().apply(BasePlugin.class); sub.getArtifacts().add(DEFAULT_CONFIGURATION_NAME, distributionArchive.getArchiveTask()); + sub.getTasks().named("assemble").configure(task -> task.dependsOn(distributionArchive.getArchiveTask())); var extractedConfiguration = sub.getConfigurations().create(EXTRACTED_CONFIGURATION_NAME); extractedConfiguration.setCanBeResolved(false); extractedConfiguration.setCanBeConsumed(true); diff --git a/distribution/packages/build.gradle b/distribution/packages/build.gradle index 9129c9a12fc9e..2ff553f0dcfa9 100644 --- a/distribution/packages/build.gradle +++ b/distribution/packages/build.gradle @@ -354,6 +354,10 @@ tasks.register('buildDeb', Deb) { configure(commonDebConfig('x64')) } +tasks.named('assemble'){ + dependsOn 'buildDeb', 'buildAarch64Deb' +} + Closure commonRpmConfig(String architecture) { return { configure(commonPackageConfig('rpm', architecture)) @@ -387,6 +391,11 @@ tasks.register('buildRpm', Rpm) { configure(commonRpmConfig('x64')) } +tasks.named('assemble'){ + dependsOn 'buildRpm', 'buildAarch64Rpm' +} + + Closure dpkgExists = { it -> new File('/bin/dpkg-deb').exists() || new File('/usr/bin/dpkg-deb').exists() || new File('/usr/local/bin/dpkg-deb').exists() } Closure rpmExists = { it -> new File('/bin/rpm').exists() || new File('/usr/bin/rpm').exists() || new File('/usr/local/bin/rpm').exists() }