Merge pull request #631 from bensonhome/main

🎨优化自定义工具拉取依赖逻辑
Tencent · Sep 28, 2022 · ba51d95 · ba51d95
2 parents 17385ce + ca5b5d1
commit ba51d95
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 8 deletions.
diff --git a/client/node/localtask/taskprocessmgr.py b/client/node/localtask/taskprocessmgr.py
@@ -57,14 +57,7 @@ def get_supported_processes(origin_os_env, task_name, task_params, custom_tools)
         # 加载工具执行需要的环境变量
         task_params["tool_name"] = task_name
         task_list = ConfigUtil.generate_task_list(task_params)
-        if ConfigUtil.use_new_tool_lib_config(task_params):  # 使用依赖库配置
-            tool_names = [task_name]
-        else:  # 使用ini配置
-            if task_name in custom_tools:
-                tool_names = ["customtool"]
-            else:
-                tool_names = [task_name]
-        ToolLoader(tool_names=tool_names, task_list=task_list, custom_tools=custom_tools,
+        ToolLoader(tool_names=[task_name], task_list=task_list, custom_tools=custom_tools,
                    include_common=True).set_tool_env()
 
         # 加载任务环境变量

diff --git a/client/task/runtask.cp37-win_amd64.pyd b/client/task/runtask.cp37-win_amd64.pyd
diff --git a/client/task/runtask.cpython-37m-aarch64-linux-gnu.so b/client/task/runtask.cpython-37m-aarch64-linux-gnu.so
diff --git a/client/task/runtask.cpython-37m-darwin.so b/client/task/runtask.cpython-37m-darwin.so
diff --git a/client/task/runtask.cpython-37m-x86_64-linux-gnu.so b/client/task/runtask.cpython-37m-x86_64-linux-gnu.so
diff --git a/client/tool/customtool.cp37-win_amd64.pyd b/client/tool/customtool.cp37-win_amd64.pyd
diff --git a/client/tool/customtool.cpython-37m-aarch64-linux-gnu.so b/client/tool/customtool.cpython-37m-aarch64-linux-gnu.so
diff --git a/client/tool/customtool.cpython-37m-darwin.so b/client/tool/customtool.cpython-37m-darwin.so
diff --git a/client/tool/customtool.cpython-37m-x86_64-linux-gnu.so b/client/tool/customtool.cpython-37m-x86_64-linux-gnu.so
diff --git a/client/util/scmurlmgr.py b/client/util/scmurlmgr.py
@@ -52,6 +52,9 @@ def get_last_dir_name_from_url(scm_url):
             dirname = dirname.replace(".zip", "")
         if dirname.endswith(".7z"):
             dirname = dirname.replace(".7z", "")
+        # 如果url包含分支，即 .git#BranchName 的格式，目录名删除.git
+        if ".git#" in dirname:
+            dirname = dirname.replace(".git#", "#")
         return dirname