Skip to content

[Gradle] More cleanup on rpm and debian packaging #133336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 21, 2025
Merged

[Gradle] More cleanup on rpm and debian packaging #133336

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions distribution/packages/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,10 +354,6 @@ tasks.register('buildDeb', Deb) {
configure(commonDebConfig('x64'))
}

tasks.named('assemble'){
dependsOn 'buildDeb', 'buildAarch64Deb'
}

Closure commonRpmConfig(String architecture) {
return {
configure(commonPackageConfig('rpm', architecture))
Expand Down Expand Up @@ -391,11 +387,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() }

Expand All @@ -409,6 +400,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
}
Expand Down