From 693c442c3119b45ce92401ec8ea322f718c42a05 Mon Sep 17 00:00:00 2001 From: Jakub Kuczys Date: Sun, 27 Aug 2023 23:38:01 +0200 Subject: [PATCH] Fix backporting to work with python/cherry-picker#70 --- red_githubbot/routers/backport_pr.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/red_githubbot/routers/backport_pr.py b/red_githubbot/routers/backport_pr.py index 0f28cf2..11e7ef9 100644 --- a/red_githubbot/routers/backport_pr.py +++ b/red_githubbot/routers/backport_pr.py @@ -18,6 +18,7 @@ "check_sha": "6251c585e4ec0a53813a9993ede3ab5309024579", "fix_commit_msg": False, "default_branch": "V3/develop", + "require_version_in_branch_name": False, } @@ -83,7 +84,9 @@ async def backport_pr(event: sansio.Event) -> None: status=utils.CheckRunStatus.IN_PROGRESS, ) - sorted_branches = sorted(branches, key=cherry_picker.version_sort_key) + sorted_branches = sorted( + branches, key=functools.partial(cherry_picker.version_sort_key, CHERRY_PICKER_CONFIG) + ) for branch in sorted_branches: try: