Skip to content

[9.1] [Gradle] Fix distribution package building after Gradle update (#133294) #133306

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 3 commits into from
Aug 21, 2025
+15 −0
Merged

[9.1] [Gradle] Fix distribution package building after Gradle update (#133294) #133306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a58a549
[Gradle] Fix distribution package building after Gradle update (#133294)
breskeby Aug 21, 2025
9c7c94b
Delete .claude/settings.local.json
breskeby Aug 21, 2025
a578605
Remove unused file
breskeby Aug 21, 2025
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
5 changes: 5 additions & 0 deletions ...roovy/org/elasticsearch/gradle/internal/InternalDistributionDownloadPluginFuncTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,11 @@ class InternalDistributionDownloadPluginFuncTest extends AbstractGradleFuncTest
}
}
}

tasks.named('assemble').configure {
dependsOn buildTar
}

artifacts {
it.add("default", buildTar)
it.add("extracted", buildExpanded)
Expand Down
1 change: 1 addition & 0 deletions ...c/main/java/org/elasticsearch/gradle/internal/InternalDistributionArchiveSetupPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
9 changes: 9 additions & 0 deletions distribution/packages/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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() }

Expand Down