|
11 | 11 |
|
12 | 12 | import com.google.common.collect.Comparators; |
13 | 13 |
|
| 14 | +import org.elasticsearch.gradle.Version; |
| 15 | +import org.elasticsearch.gradle.VersionProperties; |
14 | 16 | import org.elasticsearch.gradle.internal.transport.TransportVersionUtils.TransportVersionDefinition; |
15 | 17 | import org.elasticsearch.gradle.internal.transport.TransportVersionUtils.TransportVersionId; |
16 | 18 | import org.elasticsearch.gradle.internal.transport.TransportVersionUtils.TransportVersionLatest; |
@@ -128,11 +130,36 @@ public void validateTransportVersions() throws IOException { |
128 | 130 |
|
129 | 131 | // now load all latest versions and do validation |
130 | 132 | // NOTE: this must run after definition recording and idsByBase cleanup |
| 133 | + List<Path> latestFiles = new ArrayList<>(); |
131 | 134 | try (var latestStream = Files.list(latestDir)) { |
132 | 135 | for (var latestFile : latestStream.toList()) { |
133 | | - recordAndValidateLatest(readLatestFile(latestFile)); |
| 136 | + latestFiles.add(latestFile); |
134 | 137 | } |
135 | 138 | } |
| 139 | + if (latestFiles.size() > 1) { |
| 140 | + // only check all files on main, otherwise just check the current major/minor version |
| 141 | + // NOTE: this implicitly works for serverless because it only has one version so we skip parsing |
| 142 | + Version currentVersion = VersionProperties.getElasticsearchVersion(); |
| 143 | + boolean onMain = true; |
| 144 | + for (Path latestFile : latestFiles) { |
| 145 | + String[] branchParts = latestFile.getFileName().toString().split("\\."); |
| 146 | + int major = Integer.parseInt(branchParts[0]); |
| 147 | + int minor = Integer.parseInt(branchParts[1]); |
| 148 | + if (major > currentVersion.getMajor() || major == currentVersion.getMajor() && minor > currentVersion.getMinor()) { |
| 149 | + onMain = false; |
| 150 | + break; |
| 151 | + } |
| 152 | + } |
| 153 | + |
| 154 | + if (onMain == false) { |
| 155 | + String currentBranch = currentVersion.getMajor() + "." + currentVersion.getMinor(); |
| 156 | + latestFiles = List.of(TransportVersionUtils.latestFilePath(getResourcesDirectory().get(), currentBranch)); |
| 157 | + } |
| 158 | + } |
| 159 | + for (Path latestFile : latestFiles) { |
| 160 | + recordAndValidateLatest(readLatestFile(latestFile)); |
| 161 | + } |
| 162 | + |
136 | 163 | } |
137 | 164 |
|
138 | 165 | private String gitCommand(String... args) { |
|
0 commit comments