Skip to content

Commit e82a70c

Browse files
committed
Remove unnecessary backport config since we don't backport TO master
1 parent cadc0c3 commit e82a70c

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

.backportrc.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
{
22
"upstream": "elastic/elasticsearch",
33
"targetBranchChoices": [
4-
{ "name": "master", "checked": true },
54
"7.16",
65
"7.15",
76
"7.14",
87
"6.8"
98
],
109
"targetPRLabels": ["backport"],
1110
"branchLabelMapping": {
12-
"^v8.0.0$": "master",
1311
"^v(\\d+).(\\d+).\\d+$": "$1.$2"
1412
}
1513
}

build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,7 @@ tasks.register("verifyVersions") {
103103

104104
// Make sure backport bot config file is up to date
105105
JsonNode backportConfig = new ObjectMapper().readTree(file(".backportrc.json"))
106-
List<BwcVersions.UnreleasedVersionInfo> unreleased = BuildParams.bwcVersions.unreleased.collect { BuildParams.bwcVersions.unreleasedInfo(it) }
107-
unreleased.each { unreleasedVersion ->
106+
BuildParams.bwcVersions.forPreviousUnreleased { unreleasedVersion ->
108107
boolean valid = backportConfig.get("targetBranchChoices").elements().any { branchChoice ->
109108
if (branchChoice.isObject()) {
110109
return branchChoice.get("name").textValue() == unreleasedVersion.branch

0 commit comments

Comments
 (0)