Skip to content

Commit 13fb6db

Browse files
committed
Fix BWC distribution resolution errors (#64310)
(cherry picked from commit e6ffe9e)
1 parent e7f2bea commit 13fb6db

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,13 @@ private void registerDistributionArchiveArtifact(Project bwcProject, Distributio
151151

152152
private static List<DistributionProject> resolveArchiveProjects(File checkoutDir, Version bwcVersion) {
153153
List<String> projects = new ArrayList<>();
154-
projects.addAll(asList("deb", "rpm"));
155-
if (bwcVersion.onOrAfter("7.0.0")) {
154+
// All active BWC branches publish default and oss variants of rpm and deb packages
155+
projects.addAll(asList("deb", "rpm", "oss-deb", "oss-rpm"));
156+
157+
if (bwcVersion.onOrAfter("7.0.0")) { // starting with 7.0 we bundle a jdk which means we have platform-specific archives
156158
projects.addAll(asList("oss-windows-zip", "windows-zip", "oss-darwin-tar", "darwin-tar", "oss-linux-tar", "linux-tar"));
157-
} else {
158-
projects.addAll(asList("oss-zip", "zip", "oss-deb", "oss-rpm"));
159+
} else { // prior to 7.0 we published only a single zip and tar archives for oss and default distributions
160+
projects.addAll(asList("oss-zip", "zip", "tar", "oss-tar"));
159161
}
160162

161163
return projects.stream().map(name -> {

0 commit comments

Comments
 (0)