Update backport config file to use main as default branch

mark-vieira · mark-vieira · commit db91e1a06da1 · 2022-07-22T16:26:55.000-07:00
diff --git a/.backportrc.json b/.backportrc.json
@@ -1,7 +1,7 @@
 {
   "upstream": "elastic/elasticsearch",
   "targetBranchChoices": [
-    "master",
+    "main",
     "8.3",
     "8.2",
     "8.1",
@@ -11,7 +11,7 @@
   ],
   "targetPRLabels": ["backport"],
   "branchLabelMapping": {
-    "^v8.4.0$": "master",
+    "^v8.4.0$": "main",
     "^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$": "$1.$2"
   }
 }
diff --git a/build.gradle b/build.gradle
@@ -122,7 +122,7 @@ tasks.register("verifyVersions") {
         throw new GradleException("No branch choice exists for development branch ${unreleasedVersion.branch} in .backportrc.json.")
       }
     }
-    String versionMapping = backportConfig.get("branchLabelMapping").fields().find { it.value.textValue() == 'master' }.key
+    String versionMapping = backportConfig.get("branchLabelMapping").fields().find { it.value.textValue() == 'main' }.key
     String expectedMapping = "^v${versions.elasticsearch.replaceAll('-SNAPSHOT', '')}\$"
     if (versionMapping != expectedMapping) {
       throw new GradleException("Backport label mapping for branch 'master' is '${versionMapping}' but should be " +

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"upstream": "elastic/elasticsearch",`
`3`	`3`	`"targetBranchChoices": [`
`4`		`- "master",`
	`4`	`+ "main",`
`5`	`5`	`"8.3",`
`6`	`6`	`"8.2",`
`7`	`7`	`"8.1",`
`@@ -11,7 +11,7 @@`
`11`	`11`	`],`
`12`	`12`	`"targetPRLabels": ["backport"],`
`13`	`13`	`"branchLabelMapping": {`
`14`		`- "^v8.4.0$": "master",`
	`14`	`+ "^v8.4.0$": "main",`
`15`	`15`	`"^v(\\d+).(\\d+).\\d+(?:-(?:alpha\|beta\|rc)\\d+)?$": "$1.$2"`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ tasks.register("verifyVersions") {`
`122`	`122`	`throw new GradleException("No branch choice exists for development branch ${unreleasedVersion.branch} in .backportrc.json.")`
`123`	`123`	`}`
`124`	`124`	`}`
`125`		`- String versionMapping = backportConfig.get("branchLabelMapping").fields().find { it.value.textValue() == 'master' }.key`
	`125`	`+ String versionMapping = backportConfig.get("branchLabelMapping").fields().find { it.value.textValue() == 'main' }.key`
`126`	`126`	`String expectedMapping = "^v${versions.elasticsearch.replaceAll('-SNAPSHOT', '')}\$"`
`127`	`127`	`if (versionMapping != expectedMapping) {`
`128`	`128`	`throw new GradleException("Backport label mapping for branch 'master' is '${versionMapping}' but should be " +`