From 61da112f32c67b3aaf360a86a0e01ebbbc05e90a Mon Sep 17 00:00:00 2001 From: Mark Vieira Date: Wed, 27 Jul 2022 13:09:20 -0700 Subject: [PATCH] Ensure order of precedence in matching `main` branch in backports --- .backportrc.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.backportrc.json b/.backportrc.json index e7cb9693a80d..db858f9083e5 100644 --- a/.backportrc.json +++ b/.backportrc.json @@ -3,7 +3,7 @@ "targetBranchChoices" : [ "main", "8.4", "8.3", "8.2", "8.1", "8.0", "7.17", "6.8" ], "targetPRLabels" : [ "backport" ], "branchLabelMapping" : { - "^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2", - "^v8.5.0$" : "main" + "^v8.5.0$" : "main", + "^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2" } }