From b9b4825eed84c42763be6ac36ee716aa4b898f91 Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Thu, 21 Aug 2025 17:36:46 +0200 Subject: [PATCH] [Gradle] More cleanup on rpm and debian packaging (#133336) --- distribution/packages/build.gradle | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/distribution/packages/build.gradle b/distribution/packages/build.gradle index 61aa3a3131b13..183545ead187a 100644 --- a/distribution/packages/build.gradle +++ b/distribution/packages/build.gradle @@ -355,10 +355,6 @@ tasks.register('buildDeb', Deb) { configure(commonDebConfig('x64')) } -tasks.named('assemble'){ - dependsOn 'buildDeb', 'buildAarch64Deb' -} - Closure commonRpmConfig(String architecture) { return { configure(commonPackageConfig('rpm', architecture)) @@ -392,11 +388,6 @@ 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() } @@ -410,6 +401,11 @@ subprojects { String buildTask = "build${it.name.replaceAll(/-[a-z]/) { it.substring(1).toUpperCase() }.capitalize()}" ext.buildDist = parent.tasks.named(buildTask) + tasks.named('assemble').configure { + dependsOn buildDist + } + + // deprecated here for backwards compatibility of DistroTestPlugin and DistributionDownloadPlugin artifacts { 'default' buildDist }