Prg_ZhangXuheng
/
NLDClient-yudde
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "【打包】优化构建物名字" 

This reverts commit 3439ac502b.
main
刘涛 2026-04-10 18:08:49 +08:00
parent 3439ac502b
commit 15e7587d8f
3 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Tool/build_env/jenkins_android_dev.groovy
View File

@ -21,8 +21,6 @@ def ARTIFACT_URL = "http://${env.PHXH_BUILDER_IP_ADDRESS}:8080/job/${env.JOB_NAM
def VERSION_PARAM = "尚未获取" // 版本号 根据项目获取
def OSS_UPLOAD_PATH_PARAM // 上传地址，根据项目获取
def ASSETS_END_POINT_PARAM // Assets endPoint，根据项目获取
def BUILD_TIMESTAMP
def OUTPUT_APK_NAME
// 构建地址
def BUILD_PATH
@ -232,15 +230,10 @@ pipeline {
VERSION_PARAM = (cfg?.Version ?: '').trim()
OSS_UPLOAD_PATH_PARAM = (cfg?.OssRemoteUploadPath ?: '').trim()
ASSETS_END_POINT_PARAM = (cfg?.AssetsEndPoint ?: '').trim()
BUILD_TIMESTAMP = new Date().format("yyyyMMdd_HHmmss")
def safeChannel = CHANNEL_PARAM.replaceAll(/[^A-Za-z0-9_-]/, "_")
def safeVersion = VERSION_PARAM.replaceAll(/[^A-Za-z0-9._-]/, "_")
OUTPUT_APK_NAME = "NLD_${safeChannel}_${safeVersion}_${BUILD_TIMESTAMP}.apk"
// 3.其他数据
BUILD_PATH = "Builds/$CHANNEL_PARAM/$PLATFORM_PARAM/$VERSION_PARAM"
log_path="$BUILD_PATH/build.log"
echo "获取到的版本是 ${VERSION_PARAM}, 获取到的上传地址是 ${OSS_UPLOAD_PATH_PARAM}，获取到的assets-oss-endpoint是 ${ASSETS_END_POINT_PARAM}"
echo "[APKName] channel=${CHANNEL_PARAM}, timestamp=${BUILD_TIMESTAMP}, outputApkName=${OUTPUT_APK_NAME}"
} catch (err) {
def message = "【${PLATFORM_PARAM}】【${VERSION_PARAM}】【Debug】【${CHANNEL_PARAM}】根据渠道获取相关参数失败"
SendMessageToWechat(message)
@ -296,7 +289,7 @@ pipeline {
log_path="$BUILD_PATH/UpdatePreviousBuild.log"
}
else
build_result=sh(script: "$WORKSPACE/Tool/build_tools/build_unity.sh ${VERSION_PARAM} ${PLATFORM_PARAM} ${PROFILE_PARAM} ${CHANNEL_PARAM} ${HOTUPDATE_PARAM} ${DEBUGBUILD_PARAM} ${AAB_PARAM} ${DEV_PARAM} ${ANDROIDKEYSTORE} ${ANDROIDKEYALIAS} ${OBFUZ} ${UPLOAD_SYMBOL} true true true ${OUTPUT_APK_NAME}", returnStatus: true, returnStdout: false)
build_result=sh(script: "$WORKSPACE/Tool/build_tools/build_unity.sh ${VERSION_PARAM} ${PLATFORM_PARAM} ${PROFILE_PARAM} ${CHANNEL_PARAM} ${HOTUPDATE_PARAM} ${DEBUGBUILD_PARAM} ${AAB_PARAM} ${DEV_PARAM} ${ANDROIDKEYSTORE} ${ANDROIDKEYALIAS} ${OBFUZ} ${UPLOAD_SYMBOL}", returnStatus: true, returnStdout: false)
def parse_log = "../../$log_path"
// 打包失败
@ -385,15 +378,14 @@ pipeline {
def retryCount = (encryptConfig?.RetryCount ?: 3)
// 构建APK路径
def apkName = OUTPUT_APK_NAME ?: APK_NAME
def apkPath = "$WORKSPACE/Builds/$CHANNEL_PARAM/$PLATFORM_PARAM/$VERSION_PARAM/$apkName"
def apkPath = "$WORKSPACE/Builds/$CHANNEL_PARAM/$PLATFORM_PARAM/$VERSION_PARAM/$APK_NAME"
def outputDir = "$WORKSPACE/Builds/$CHANNEL_PARAM/$PLATFORM_PARAM/$VERSION_PARAM"
// 替换WORKSPACE变量
toolPath = toolPath.replace('${WORKSPACE}', WORKSPACE)
// 构建加密命令
def encryptCmd = "java -jar '${toolPath}' -t apk -u '${apiUrl}' -r '${username}' -w '${password}' -k '${apkPath}' -s '${strategyName}' -d '${outputDir}' -n '${apkName}' -y ${retryCount}"
def encryptCmd = "java -jar '${toolPath}' -t apk -u '${apiUrl}' -r '${username}' -w '${password}' -k '${apkPath}' -s '${strategyName}' -d '${outputDir}' -n '${APK_NAME}' -y ${retryCount}"
// 添加签名参数
if (needSign) {
@ -568,4 +560,4 @@ pipeline {
}
}
}
}
}

16
Tool/build_env/jenkins_build_android_dev.groovy
View File

@ -24,8 +24,6 @@ def ARTIFACT_URL = "http://${env.PHXH_BUILDER_IP_ADDRESS}:8080/job/${env.JOB_NAM
def VERSION_PARAM = "尚未获取" // 版本号 根据项目获取
def OSS_UPLOAD_PATH_PARAM // 上传地址，根据项目获取
def ASSETS_END_POINT_PARAM // Assets endPoint，根据项目获取
def BUILD_TIMESTAMP
def OUTPUT_APK_NAME
// 构建地址
def BUILD_PATH
@ -221,15 +219,10 @@ pipeline {
VERSION_PARAM = (cfg?.Version ?: '').trim()
OSS_UPLOAD_PATH_PARAM = (cfg?.OssRemoteUploadPath ?: '').trim()
ASSETS_END_POINT_PARAM = (cfg?.AssetsEndPoint ?: '').trim()
BUILD_TIMESTAMP = new Date().format("yyyyMMdd_HHmmss")
def safeChannel = CHANNEL_PARAM.replaceAll(/[^A-Za-z0-9_-]/, "_")
def safeVersion = VERSION_PARAM.replaceAll(/[^A-Za-z0-9._-]/, "_")
OUTPUT_APK_NAME = "NLD_${safeChannel}_${safeVersion}_${BUILD_TIMESTAMP}.apk"
// 3.其他数据
BUILD_PATH = "Builds/$CHANNEL_PARAM/$PLATFORM_PARAM/$VERSION_PARAM"
log_path="$BUILD_PATH/build.log"
echo "获取到的版本是 ${VERSION_PARAM}, 获取到的上传地址是 ${OSS_UPLOAD_PATH_PARAM}，获取到的assets-oss-endpoint是 ${ASSETS_END_POINT_PARAM}"
echo "[APKName] channel=${CHANNEL_PARAM}, timestamp=${BUILD_TIMESTAMP}, outputApkName=${OUTPUT_APK_NAME}"
} catch (err) {
def message = "【${PLATFORM_PARAM}】【${VERSION_PARAM}】【Debug】【${CHANNEL_PARAM}】根据渠道获取相关参数失败"
SendMessageToWechat(message)
@ -285,7 +278,7 @@ pipeline {
log_path="$BUILD_PATH/UpdatePreviousBuild.log"
}
else
build_result=sh(script: "$WORKSPACE/Tool/build_tools/build_unity.sh ${VERSION_PARAM} ${PLATFORM_PARAM} ${PROFILE_PARAM} ${CHANNEL_PARAM} ${HOTUPDATE_PARAM} ${DEBUGBUILD_PARAM} ${AAB_PARAM} ${DEV_PARAM} ${ANDROIDKEYSTORE} ${ANDROIDKEYALIAS} ${OBFUZ} ${UPLOAD_SYMBOL} ${PackDefaultRes} ${PackDllRes} ${PackConfigRes} ${OUTPUT_APK_NAME}", returnStatus: true, returnStdout: false)
build_result=sh(script: "$WORKSPACE/Tool/build_tools/build_unity.sh ${VERSION_PARAM} ${PLATFORM_PARAM} ${PROFILE_PARAM} ${CHANNEL_PARAM} ${HOTUPDATE_PARAM} ${DEBUGBUILD_PARAM} ${AAB_PARAM} ${DEV_PARAM} ${ANDROIDKEYSTORE} ${ANDROIDKEYALIAS} ${OBFUZ} ${UPLOAD_SYMBOL} ${PackDefaultRes} ${PackDllRes} ${PackConfigRes}", returnStatus: true, returnStdout: false)
def parse_log = "../../$log_path"
// 打包失败
@ -374,15 +367,14 @@ pipeline {
def retryCount = (encryptConfig?.RetryCount ?: 3)
// 构建APK路径
def apkName = OUTPUT_APK_NAME ?: APK_NAME
def apkPath = "$WORKSPACE/Builds/$CHANNEL_PARAM/$PLATFORM_PARAM/$VERSION_PARAM/$apkName"
def apkPath = "$WORKSPACE/Builds/$CHANNEL_PARAM/$PLATFORM_PARAM/$VERSION_PARAM/$APK_NAME"
def outputDir = "$WORKSPACE/Builds/$CHANNEL_PARAM/$PLATFORM_PARAM/$VERSION_PARAM"
// 替换WORKSPACE变量
toolPath = toolPath.replace('${WORKSPACE}', WORKSPACE)
// 构建加密命令
def encryptCmd = "java -jar '${toolPath}' -t apk -u '${apiUrl}' -r '${username}' -w '${password}' -k '${apkPath}' -s '${strategyName}' -d '${outputDir}' -n '${apkName}' -y ${retryCount}"
def encryptCmd = "java -jar '${toolPath}' -t apk -u '${apiUrl}' -r '${username}' -w '${password}' -k '${apkPath}' -s '${strategyName}' -d '${outputDir}' -n '${APK_NAME}' -y ${retryCount}"
// 添加签名参数
if (needSign) {
@ -557,4 +549,4 @@ pipeline {
}
}
}
}
}

2
Tool/build_tools

@ -1 +1 @@
Subproject commit e4df2e9f03e927b87ae4374b021143cfa6c123a7
Subproject commit 34a565305a05419f893d18702b66e0fdc049625c