github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-04-19 04:45:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

[bwc] Add bugfix3 project (#126880)

Browse source
This commit is contained in:
Brian Seeders 2025-04-16 16:27:03 -04:00 • committed by GitHub
parent a813949c34
commit 3d78c9428c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build-tools-internal/src/integTest/resources/org/elasticsearch/gradle/internal/fake_git/remote/settings.gradle
View file

@ -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"

6
build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/BwcVersions.java
View file

@ -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;
}
}

1
build.gradle
View file

@ -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"

0
distribution/bwc/bugfix3/build.gradle Normal file
View file

1
settings.gradle
View file

@ -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',