From 3d78c9428c8b9ffd3da0207533f84ad8ba17e34d Mon Sep 17 00:00:00 2001 From: Brian Seeders Date: Wed, 16 Apr 2025 16:27:03 -0400 Subject: [PATCH] [bwc] Add bugfix3 project (#126880) --- .../gradle/internal/fake_git/remote/settings.gradle | 1 + .../java/org/elasticsearch/gradle/internal/BwcVersions.java | 6 +++--- build.gradle | 1 + distribution/bwc/bugfix3/build.gradle | 0 settings.gradle | 1 + 5 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 distribution/bwc/bugfix3/build.gradle diff --git a/build-tools-internal/src/integTest/resources/org/elasticsearch/gradle/internal/fake_git/remote/settings.gradle b/build-tools-internal/src/integTest/resources/org/elasticsearch/gradle/internal/fake_git/remote/settings.gradle index 1774ac0b0a11..a07060c3be18 100644 --- a/build-tools-internal/src/integTest/resources/org/elasticsearch/gradle/internal/fake_git/remote/settings.gradle +++ b/build-tools-internal/src/integTest/resources/org/elasticsearch/gradle/internal/fake_git/remote/settings.gradle @@ -11,6 +11,7 @@ rootProject.name = "root" include ":distribution:bwc:bugfix" include ":distribution:bwc:bugfix2" +include ":distribution:bwc:bugfix3" include ":distribution:bwc:minor" include ":distribution:bwc:major" include ":distribution:bwc:staged" diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/BwcVersions.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/BwcVersions.java index 5c1caa08bfaa..15d13e567ca4 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/BwcVersions.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/BwcVersions.java @@ -165,7 +165,7 @@ public class BwcVersions implements Serializable { .sorted(reverseOrder(comparing(s -> Version.fromString(s, Version.Mode.RELAXED)))) .toList(); - boolean existingBugfix = false; + int bugfixCount = 0; boolean existingStaged = false; for (int i = 0; i < featureFreezeBranches.size(); i++) { String branch = featureFreezeBranches.get(i); @@ -198,9 +198,9 @@ public class BwcVersions implements Serializable { result.put(version, new UnreleasedVersionInfo(version, branch, ":distribution:bwc:" + project)); existingStaged = true; } else { // This is a bugfix - String project = existingBugfix ? "bugfix2" : "bugfix"; + bugfixCount++; + String project = "bugfix" + (bugfixCount > 1 ? bugfixCount : ""); result.put(version, new UnreleasedVersionInfo(version, branch, ":distribution:bwc:" + project)); - existingBugfix = true; } } diff --git a/build.gradle b/build.gradle index 3000fd122d06..d5fc7ef8ecfb 100644 --- a/build.gradle +++ b/build.gradle @@ -301,6 +301,7 @@ allprojects { // ensure we have best possible caching of bwc builds dependsOn ":distribution:bwc:bugfix:buildBwcLinuxTar" dependsOn ":distribution:bwc:bugfix2:buildBwcLinuxTar" + dependsOn ":distribution:bwc:bugfix3:buildBwcLinuxTar" dependsOn ":distribution:bwc:minor:buildBwcLinuxTar" dependsOn ":distribution:bwc:staged:buildBwcLinuxTar" dependsOn ":distribution:bwc:staged2:buildBwcLinuxTar" diff --git a/distribution/bwc/bugfix3/build.gradle b/distribution/bwc/bugfix3/build.gradle new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/settings.gradle b/settings.gradle index d10567756046..c8ced438bf53 100644 --- a/settings.gradle +++ b/settings.gradle @@ -78,6 +78,7 @@ List projects = [ 'distribution:packages:rpm', 'distribution:bwc:bugfix', 'distribution:bwc:bugfix2', + 'distribution:bwc:bugfix3', 'distribution:bwc:maintenance', 'distribution:bwc:minor', 'distribution:bwc:staged',