Merge remote-tracking branch 'refs/remotes/origin/2.4.0-fix-get_obpro…

…xy_version' into 2.4.0-silent-print
oceanbase · Aug 13, 2024 · 6fd4148 · 6fd4148
2 parents 28c358c + 5a1b507
commit 6fd4148
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/build_package.yml b/.github/workflows/build_package.yml
@@ -7,6 +7,7 @@ on:
   push:
     branches:
       - master
+      - 2.4.0-fix-get_obproxy_version
 
 env:
   ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true

diff --git a/common/command.py b/common/command.py
@@ -286,7 +286,8 @@ def get_obproxy_version(context):
     obproxy_version_info = ssh_client.exec_cmd(cmd)
     stdio.verbose("get obproxy version, run cmd = [{0}] ".format(cmd))
     if obproxy_version_info is not None:
-        ob_version = re.findall(r'[(]OceanBase.(.+? +?)[)]', obproxy_version_info)
+        pattern = r"(\d+\.\d+\.\d+\.\d+)"
+        ob_version = re.findall(pattern, obproxy_version_info)
         if len(ob_version) > 0:
             return ob_version[0]
         else:
@@ -295,7 +296,6 @@ def get_obproxy_version(context):
             stdio.verbose("get obproxy version with LD_LIBRARY_PATH,cmd:{0}, result:{1}".format(cmd, obproxy_version_info))
             if "REVISION" not in obproxy_version_info:
                 raise Exception("Please check conf about proxy,{0}".format(obproxy_version_info))
-            pattern = r"(\d+\.\d+\.\d+\.\d+)"
             match = re.search(pattern, obproxy_version_info)
             if match:
                 obproxy_version_info = match.group(1)
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ on: @@
       push:
         branches:
           - master
+          - 2.4.0-fix-get_obproxy_version
     env:
       ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
@@ Expand Down @@