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

【打包】构建包体路径修改

main
zhangaotian 2024-10-16 13:40:29 +08:00
parent 7dd239c02a
commit 56137a45d8
4 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Tool/build_env/jenkins_android_dev.groovy
View File

@ -15,7 +15,7 @@ def OSS_PARAM = false
def ARTIFACT_URL = "http://${env.PHXH_BUILDER_IP_ADDRESS}:8080/job/${env.JOB_NAME}/"
// 构建地址
def BUILD_PATH = "Builds/$PLATFORM_PARAM/$VERSION_PARAM"
def BUILD_PATH = "Builds/$CHANNEL_PARAM/$PLATFORM_PARAM/$VERSION_PARAM"
// 日志地址
def log_path="$BUILD_PATH/build.log"
@ -124,7 +124,7 @@ pipeline {
sh "chmod +x $WORKSPACE/Tool/build_tools/upload_rsync.sh"
def asset_path="$WORKSPACE/ProjectNLD/ServerData/${PLATFORM_PARAM}"
def upload_path="${CHANNEL_PARAM}/${PLATFORM_PARAM}/${VERSION_PARAM}"
def upload_result=sh(script: "$WORKSPACE/Tool/build_tools/upload_rsync.sh ${VERSION_PARAM} ${PLATFORM_PARAM} ${CHANNEL_PARAM} ${asset_path} ${upload_path}", returnStatus: true, returnStdout: false)
def upload_result=sh(script: "$WORKSPACE/Tool/build_tools/upload_rsync.sh ${asset_path} ${upload_path}", returnStatus: true, returnStdout: false)
if(upload_result != 0)
{
def message = "【${PLATFORM_PARAM}】【${VERSION_PARAM}】【Debug】【${CHANNEL_PARAM}】上传资源失败"
@ -139,9 +139,9 @@ pipeline {
script {
// 增量更新不需要上传包体
if (params.Build_InitApp == true){
def apk_path="$WORKSPACE/Builds/$PLATFORM_PARAM/$VERSION_PARAM/$APK_NAME"
def apk_path="$WORKSPACE/Builds/$CHANNEL_PARAM/$PLATFORM_PARAM/$VERSION_PARAM/$APK_NAME"
def upload_path="${CHANNEL_PARAM}/${PLATFORM_PARAM}"
def upload_result=sh(script: "$WORKSPACE/Tool/build_tools/upload_rsync.sh ${VERSION_PARAM} ${PLATFORM_PARAM} ${CHANNEL_PARAM} ${apk_path} ${upload_path}", returnStatus: true, returnStdout: false)
def upload_result=sh(script: "$WORKSPACE/Tool/build_tools/upload_rsync.sh ${apk_path} ${upload_path}", returnStatus: true, returnStdout: false)
if(upload_result != 0)
{
def message = "【${PLATFORM_PARAM}】【${VERSION_PARAM}】【Debug】【${CHANNEL_PARAM}】上传APK失败"
@ -158,7 +158,8 @@ pipeline {
// 增量更新不需要上传符号表
sh "chmod +x $WORKSPACE/Tool/build_tools/upload_symbol_file.sh"
if (params.Build_InitApp == true){
def upload_result=sh(script: "$WORKSPACE/Tool/build_tools/upload_symbol_file.sh ${VERSION_PARAM} ${PLATFORM_PARAM}", returnStatus: true, returnStdout: false)
def symbol_path="$WORKSPACE/Builds/$CHANNEL_PARAM/$PLATFORM_PARAM/$VERSION_PARAM"
def upload_result=sh(script: "$WORKSPACE/Tool/build_tools/upload_symbol_file.sh ${VERSION_PARAM} ${symbol_path}", returnStatus: true, returnStdout: false)
if(upload_result != 0)
{
def message = "【${PLATFORM_PARAM}】【${VERSION_PARAM}】【Debug】【${CHANNEL_PARAM}】上传符号表异常"

23
Tool/build_env/jenkins_android_release.groovy
View File

@ -15,7 +15,7 @@ def OSS_PARAM = IsOSS()
def ARTIFACT_URL = "http://${env.PHXH_BUILDER_IP_ADDRESS}:8080/job/${env.JOB_NAME}/"
// 构建地址
def BUILD_PATH = "Builds/$PLATFORM_PARAM/$VERSION_PARAM"
def BUILD_PATH = "Builds/$CHANNEL_PARAM/$PLATFORM_PARAM/$VERSION_PARAM"
// 日志地址
def log_path="$BUILD_PATH/build.log"
@ -45,22 +45,20 @@ def ParseBuildLogError(logPath){
SendMessageToWechat(processSceneMessage)
}
def GetRemote()
{
def GetRemote(){
if('Banshu' == params.Channel)
return 'shenhe';
else if('Official' == params.Channel)
return 'main'
else if('TapTap' == params.Channel)
return 'main'
return 'tap_release'
else if('ReleaseTest' == params.Channel)
return 'main'
else
return 'stable_dev';
}
def IsOSS()
{
def IsOSS(){
if('StableDev' == params.Channel)
return false;
else
@ -151,9 +149,9 @@ pipeline {
def upload_path="${CHANNEL_PARAM}/${PLATFORM_PARAM}/${VERSION_PARAM}"
def upload_result
if(IsOSS())
upload_result=sh(script: "$WORKSPACE/Tool/build_tools/upload_oss.sh ${VERSION_PARAM} ${PLATFORM_PARAM} ${CHANNEL_PARAM} ${asset_path} ${upload_path}", returnStatus: true, returnStdout: false)
upload_result=sh(script: "$WORKSPACE/Tool/build_tools/upload_oss.sh ${asset_path} ${upload_path}", returnStatus: true, returnStdout: false)
else
upload_result=sh(script: "$WORKSPACE/Tool/build_tools/upload_rsync.sh ${VERSION_PARAM} ${PLATFORM_PARAM} ${CHANNEL_PARAM} ${asset_path} ${upload_path}", returnStatus: true, returnStdout: false)
upload_result=sh(script: "$WORKSPACE/Tool/build_tools/upload_rsync.sh ${asset_path} ${upload_path}", returnStatus: true, returnStdout: false)
if(upload_result != 0)
{
def message = "【${PLATFORM_PARAM}】【${VERSION_PARAM}】【Release】【${CHANNEL_PARAM}】上传资源失败"
@ -168,13 +166,13 @@ pipeline {
script {
// 增量更新不需要上传包体
if (params.Build_InitApp == true){
def apk_path="$WORKSPACE/Builds/$PLATFORM_PARAM/$VERSION_PARAM/$APK_NAME"
def apk_path="$WORKSPACE/Builds/$CHANNEL_PARAM/$PLATFORM_PARAM/$VERSION_PARAM/$APK_NAME"
def upload_path="${CHANNEL_PARAM}/${PLATFORM_PARAM}"
def upload_result
if(IsOSS())
upload_result=sh(script: "$WORKSPACE/Tool/build_tools/upload_oss.sh ${VERSION_PARAM} ${PLATFORM_PARAM} ${CHANNEL_PARAM} ${apk_path} ${upload_path}", returnStatus: true, returnStdout: false)
upload_result=sh(script: "$WORKSPACE/Tool/build_tools/upload_oss.sh ${apk_path} ${upload_path}", returnStatus: true, returnStdout: false)
else
upload_result=sh(script: "$WORKSPACE/Tool/build_tools/upload_rsync.sh ${VERSION_PARAM} ${PLATFORM_PARAM} ${CHANNEL_PARAM} ${apk_path} ${upload_path}", returnStatus: true, returnStdout: false)
upload_result=sh(script: "$WORKSPACE/Tool/build_tools/upload_rsync.sh ${apk_path} ${upload_path}", returnStatus: true, returnStdout: false)
if(upload_result != 0)
{
@ -192,7 +190,8 @@ pipeline {
// 增量更新不需要上传符号表
sh "chmod +x $WORKSPACE/Tool/build_tools/upload_symbol_file.sh"
if (params.Build_InitApp == true){
def upload_result=sh(script: "$WORKSPACE/Tool/build_tools/upload_symbol_file.sh ${VERSION_PARAM} ${PLATFORM_PARAM}", returnStatus: true, returnStdout: false)
def symbol_path="$WORKSPACE/Builds/$CHANNEL_PARAM/$PLATFORM_PARAM/$VERSION_PARAM"
def upload_result=sh(script: "$WORKSPACE/Tool/build_tools/upload_symbol_file.sh ${VERSION_PARAM} ${symbol_path}", returnStatus: true, returnStdout: false)
if(upload_result != 0)
{
def message = "【${PLATFORM_PARAM}】【${VERSION_PARAM}】【Release】【${CHANNEL_PARAM}】上传符号表异常"

14
Tool/build_env/jenkins_iOS_dev.groovy
View File

@ -13,7 +13,7 @@ def HOTUPDATE_PARAM = params.Enable_Hot_Update
// Jenkins 归档地址
def ARTIFACT_URL = "http://${env.PHXH_BUILDER_IP_ADDRESS}:8080/job/${env.JOB_NAME}/"
// 构建地址
def BUILD_PATH = "Builds/$PLATFORM_PARAM/$VERSION_PARAM"
def BUILD_PATH = "Builds/$CHANNEL_PARAM/$PLATFORM_PARAM/$VERSION_PARAM"
// 日志地址
def log_path="$BUILD_PATH/build.log"
// xcode 项目相关参数
@ -128,7 +128,7 @@ pipeline {
sh "chmod +x $WORKSPACE/Tool/build_tools/upload_rsync.sh"
def asset_path="$WORKSPACE/ProjectNLD/ServerData/${PLATFORM_PARAM}"
def upload_path="${CHANNEL_PARAM}/${PLATFORM_PARAM}/${VERSION_PARAM}"
def upload_result=sh(script: "$WORKSPACE/Tool/build_tools/upload_rsync.sh ${VERSION_PARAM} ${PLATFORM_PARAM} ${CHANNEL_PARAM} ${asset_path} ${upload_path}", returnStatus: true, returnStdout: false)
def upload_result=sh(script: "$WORKSPACE/Tool/build_tools/upload_rsync.sh ${asset_path} ${upload_path}", returnStatus: true, returnStdout: false)
if(upload_result != 0)
{
def message = "【${PLATFORM_PARAM}】【${VERSION_PARAM}】【Debug】【${CHANNEL_PARAM}】上传资源失败"
@ -142,8 +142,9 @@ pipeline {
steps {
script {
if (params.Build_InitApp == true) {
def project_path="$WORKSPACE/Builds/$CHANNEL_PARAM/$PLATFORM_PARAM/$VERSION_PARAM"
sh "chmod +x $WORKSPACE/Tool/build_tools/build_xcode_xcodeproj.sh"
sh "$WORKSPACE/Tool/build_tools/build_xcode_xcodeproj.sh ${PROJECT_NAME} ${SCHEME_NAME} ${PLATFORM_PARAM} ${VERSION_PARAM}"
sh "$WORKSPACE/Tool/build_tools/build_xcode_xcodeproj.sh ${PROJECT_NAME} ${SCHEME_NAME} ${project_path}"
}
}
@ -153,8 +154,9 @@ pipeline {
steps {
script {
if (params.Build_InitApp == true) {
def path="$WORKSPACE/Builds/$CHANNEL_PARAM/$PLATFORM_PARAM/$VERSION_PARAM/"
sh "chmod +x $WORKSPACE/Tool/build_tools/rename_ipa.sh"
sh "$WORKSPACE/Tool/build_tools/rename_ipa.sh ${VERSION_PARAM} ${PLATFORM_PARAM}"
sh "$WORKSPACE/Tool/build_tools/rename_ipa.sh ${path}"
}
}
@ -165,9 +167,9 @@ pipeline {
script {
// 增量更新不需要上传包体
if (params.Build_InitApp == true){
def ipa_path="$WORKSPACE/Builds/$PLATFORM_PARAM/$VERSION_PARAM/$IPA_NAME"
def ipa_path="$WORKSPACE/Builds/$CHANNEL_PARAM/$PLATFORM_PARAM/$VERSION_PARAM/$IPA_NAME"
def upload_path="${CHANNEL_PARAM}/${PLATFORM_PARAM}"
def upload_result=sh(script: "$WORKSPACE/Tool/build_tools/upload_rsync.sh ${VERSION_PARAM} ${PLATFORM_PARAM} ${CHANNEL_PARAM} ${ipa_path} ${upload_path}", returnStatus: true, returnStdout: false)
def upload_result=sh(script: "$WORKSPACE/Tool/build_tools/upload_rsync.sh ${ipa_path} ${upload_path}", returnStatus: true, returnStdout: false)
if(upload_result != 0)
{
def message = "【${PLATFORM_PARAM}】【${VERSION_PARAM}】【Debug】【${CHANNEL_PARAM}】上传IPA失败"

2
Tool/build_tools

@ -1 +1 @@
Subproject commit affb98755d9395a506b014b7863bbc596eee88b3
Subproject commit 655e8f009ee164034849264b7756e11d2b7dfa7a