From 723e113fa0a1805aee78204aa727276df1d99e0c Mon Sep 17 00:00:00 2001 From: Viacheslav Bocharov Date: Mon, 22 Sep 2025 18:19:38 +0300 Subject: [PATCH 1/2] docker/generate_tags.py: add jh release suffix --- docker/generate_tags.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/generate_tags.py b/docker/generate_tags.py index 7c1416e75524..a75be93e8768 100755 --- a/docker/generate_tags.py +++ b/docker/generate_tags.py @@ -37,7 +37,7 @@ def main(): args = parser.parse_args() # detect channel from tag - match = re.match(r"^(\d+\.\d+)(?:\.\d+)(?:(b\d+)|(-dev\d+))?$", args.tag) + match = re.match(r"^(\d+\.\d+)\.\d+(?:(b\d+)|(-dev\d+)|(jh\d*))?$",args.tag) major_minor_version = None if match is None: # eg 2023.12.0-dev20231109-testbranch channel = None # Ran with custom tag for a branch etc From 95342d870393cb663ef93c5570a4e1720150864c Mon Sep 17 00:00:00 2001 From: Viacheslav Bocharov Date: Wed, 24 Sep 2025 18:02:06 +0300 Subject: [PATCH 2/2] Update docker/generate_tags.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Viacheslav Bocharov --- docker/generate_tags.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/generate_tags.py b/docker/generate_tags.py index a75be93e8768..69d26713151d 100755 --- a/docker/generate_tags.py +++ b/docker/generate_tags.py @@ -37,7 +37,7 @@ def main(): args = parser.parse_args() # detect channel from tag - match = re.match(r"^(\d+\.\d+)\.\d+(?:(b\d+)|(-dev\d+)|(jh\d*))?$",args.tag) + match = re.match(r"^(\d+\.\d+)\.\d+(?:(b\d+)|(-dev\d+)|(jh\d*))?$", args.tag) major_minor_version = None if match is None: # eg 2023.12.0-dev20231109-testbranch channel = None # Ran with custom tag for a branch etc