From 6ef1fcf4b81d1c04bb23ea1a11c6fa8f90e69c2c Mon Sep 17 00:00:00 2001 From: liuchunguang <345080091@qq.com> Date: Wed, 8 Apr 2026 12:46:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=B8=BF=E8=92=99=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E9=85=8D=E7=BD=AE=EF=BC=8C=E6=9B=B4=E6=96=B0=E5=AD=90?= =?UTF-8?q?=E4=BB=93=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tool/build_env/jenkins_harmoy_dev.groovy | 6 ++++-- Tool/build_tools | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Tool/build_env/jenkins_harmoy_dev.groovy b/Tool/build_env/jenkins_harmoy_dev.groovy index 94eae9c06fc..cba78fab684 100644 --- a/Tool/build_env/jenkins_harmoy_dev.groovy +++ b/Tool/build_env/jenkins_harmoy_dev.groovy @@ -13,7 +13,7 @@ def DEV_PARAM = true def ANDROIDKEYSTORE = "/Users/mayuanzheng/key/phxh_android.keystore" def ANDROIDKEYALIAS = "avery" def UPLOAD_SYMBOL = params.UploadSymbol -def TUANJIE_VERSION = params.TuanjieVersion ?: "2022.3.61t8" // 团结引擎版本,默认 1.4.4 +def TUANJIE_VERSION = params.TuanjieVersion ?: "2022.3.62t7" // 团结引擎版本 // Jenkins 归档地址 def ARTIFACT_URL = "http://${env.PHXH_BUILDER_IP_ADDRESS}:8080/job/${env.JOB_NAME}/" @@ -28,7 +28,7 @@ def BUILD_PATH def log_path def GetRemote(){ - return 'feature/tuanjie_dev'; + return 'dev'; } def CheckRemoteBranchExists(repoUrl, branchName) { @@ -409,6 +409,7 @@ EOF""" } } } +/* stage('通知') { steps { script { @@ -422,5 +423,6 @@ EOF""" } } } +*/ } } diff --git a/Tool/build_tools b/Tool/build_tools index 6a91b7707bc..cd14fee975e 160000 --- a/Tool/build_tools +++ b/Tool/build_tools @@ -1 +1 @@ -Subproject commit 6a91b7707bc00e5b15c6028b0c7286a6c8cbe32a +Subproject commit cd14fee975e836ce116ad557326be98e73b5f402