diff --git a/Tool/build_env/jenkins_android_dev.groovy b/Tool/build_env/jenkins_android_dev.groovy index c3fb56f812d..057fc62d55b 100644 --- a/Tool/build_env/jenkins_android_dev.groovy +++ b/Tool/build_env/jenkins_android_dev.groovy @@ -12,6 +12,7 @@ def OBFUZ = params.Obfuz def DEV_PARAM = true def ANDROIDKEYSTORE = "/Users/mayuanzheng/key/phxh_android.keystore" def ANDROIDKEYALIAS = "avery" +def UPLOAD_SYMBOL = params.UploadSymbol // Jenkins 归档地址 def ARTIFACT_URL = "http://${env.PHXH_BUILDER_IP_ADDRESS}:8080/job/${env.JOB_NAME}/" @@ -212,7 +213,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}", 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} ${UPLOAD_SYMBOL}", returnStatus: true, returnStdout: false) def parse_log = "../../$log_path" // 打包失败 @@ -285,7 +286,7 @@ pipeline { stage('上传符号表') { steps { script { - if(params.UploadSymbol == true) + if(UPLOAD_SYMBOL == true) { // 增量更新不需要上传符号表 sh "chmod +x $WORKSPACE/Tool/build_tools/upload_symbol_file.sh" diff --git a/Tool/build_env/jenkins_android_release_new.groovy b/Tool/build_env/jenkins_android_release_new.groovy index fae7ed9dec9..848b40ef099 100644 --- a/Tool/build_env/jenkins_android_release_new.groovy +++ b/Tool/build_env/jenkins_android_release_new.groovy @@ -11,6 +11,7 @@ def AAB_PARAM = params.AAB def DEV_PARAM = IsDev() def ANDROIDKEYSTORE = "/Users/mayuanzheng/key/phxh_android.keystore" def ANDROIDKEYALIAS = "avery" +def UPLOAD_SYMBOL = true // Jenkins 归档地址 def ARTIFACT_URL = "http://${env.PHXH_BUILDER_IP_ADDRESS}:8080/job/${env.JOB_NAME}/" @@ -217,7 +218,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}", 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} ${UPLOAD_SYMBOL}", returnStatus: true, returnStdout: false) // 打包失败 if(build_result != 0) @@ -280,21 +281,24 @@ pipeline { stage('上传符号表') { steps { script { - // 增量更新不需要上传符号表 - sh "chmod +x $WORKSPACE/Tool/build_tools/upload_symbol_file.sh" - if (params.Build_InitApp == true){ - def playersettings = "${WORKSPACE}/Tool/Channels/${CHANNEL_PARAM}/ChannelSetting.yaml" - def symbol_path="$WORKSPACE/Builds/$CHANNEL_PARAM/$PLATFORM_PARAM/$VERSION_PARAM" + if(UPLOAD_SYMBOL == true) + { + // 增量更新不需要上传符号表 + sh "chmod +x $WORKSPACE/Tool/build_tools/upload_symbol_file.sh" + if (params.Build_InitApp == true){ + def playersettings = "${WORKSPACE}/Tool/Channels/${CHANNEL_PARAM}/ChannelSetting.yaml" + def symbol_path="$WORKSPACE/Builds/$CHANNEL_PARAM/$PLATFORM_PARAM/$VERSION_PARAM" - def crashsightConfig = cfg?."CrashSight_${PLATFORM_PARAM}" - def crashsightId = (crashsightConfig?.id ?: '').trim() - def crashsightKey = (crashsightConfig?.key ?: '').trim() - def upload_result = sh(script: "$WORKSPACE/Tool/build_tools/upload_symbol_file.sh ${VERSION_PARAM} ${PLATFORM_PARAM} ${symbol_path} ${crashsightId} ${crashsightKey}", returnStatus: true, returnStdout: false) - if(upload_result != 0) - { - def message = "【${PLATFORM_PARAM}】【${VERSION_PARAM}】【Release】【${CHANNEL_PARAM}】上传符号表异常" - SendMessageToWechat(message) - } + def crashsightConfig = cfg?."CrashSight_${PLATFORM_PARAM}" + def crashsightId = (crashsightConfig?.id ?: '').trim() + def crashsightKey = (crashsightConfig?.key ?: '').trim() + def upload_result = sh(script: "$WORKSPACE/Tool/build_tools/upload_symbol_file.sh ${VERSION_PARAM} ${PLATFORM_PARAM} ${symbol_path} ${crashsightId} ${crashsightKey}", returnStatus: true, returnStdout: false) + if(upload_result != 0) + { + def message = "【${PLATFORM_PARAM}】【${VERSION_PARAM}】【Release】【${CHANNEL_PARAM}】上传符号表异常" + SendMessageToWechat(message) + } + } } } }