diff --git a/Tool/build_env/jenkins_iOS_dev.groovy b/Tool/build_env/jenkins_iOS_dev.groovy index 5860e341256..4aaa73dcf03 100644 --- a/Tool/build_env/jenkins_iOS_dev.groovy +++ b/Tool/build_env/jenkins_iOS_dev.groovy @@ -38,7 +38,7 @@ def ParseBuildLogError(logPath){ def sceneMessage = sh(script: "${WORKSPACE}/Tool/build_tools/parse_unity_build_log.sh ${logPath} 'Problem detected while' true true", returnStdout: true).trim() def multipleMessage = sh(script: "${WORKSPACE}/Tool/build_tools/parse_unity_build_log.sh ${logPath} 'Multiple Unity' true false", returnStdout: true).trim() def processSceneMessage = sh(script: "${WORKSPACE}/Tool/build_tools/parse_unity_build_log.sh ${logPath} 'Failed to process scene' true false", returnStdout: true).trim() - + SendMessageToWechat(errorMessage) SendMessageToWechat(exceptionMessage) SendMessageToWechat(sceneMessage) @@ -147,7 +147,6 @@ pipeline { sh "$WORKSPACE/Tool/build_tools/build_xcode_xcodeproj.sh ${PROJECT_NAME} ${SCHEME_NAME} ${project_path}" } } - } } stage('重命名IPA') { @@ -159,7 +158,6 @@ pipeline { sh "$WORKSPACE/Tool/build_tools/rename_ipa.sh ${path}" } } - } } stage('上传IPA') { @@ -169,8 +167,10 @@ pipeline { if (params.Build_InitApp == true){ def ipa_path="$WORKSPACE/Builds/$CHANNEL_PARAM/$PLATFORM_PARAM/$VERSION_PARAM/$IPA_NAME" def upload_path="${CHANNEL_PARAM}/${PLATFORM_PARAM}" + def upload_path_with_version="${CHANNEL_PARAM}/${PLATFORM_PARAM}/${VERSION_PARAM}" 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 upload_result_with_version=sh(script: "$WORKSPACE/Tool/build_tools/upload_rsync.sh ${ipa_path} ${upload_path_with_version}", returnStatus: true, returnStdout: false) + if(upload_result != 0 || upload_result_with_version != 0) { def message = "【${PLATFORM_PARAM}】【${VERSION_PARAM}】【Debug】【${CHANNEL_PARAM}】上传IPA失败" SendMessageToWechat(message) diff --git a/Tool/build_env/jenkins_iOS_release.groovy b/Tool/build_env/jenkins_iOS_release.groovy index 27b8a9b74ea..e4d1ef4ecc0 100644 --- a/Tool/build_env/jenkins_iOS_release.groovy +++ b/Tool/build_env/jenkins_iOS_release.groovy @@ -196,12 +196,18 @@ pipeline { if (params.Build_InitApp == true){ def ipa_path="$WORKSPACE/Builds/$CHANNEL_PARAM/$PLATFORM_PARAM/$VERSION_PARAM/$IPA_NAME" def upload_path="${CHANNEL_PARAM}/${PLATFORM_PARAM}" + def upload_path_with_version="${CHANNEL_PARAM}/${PLATFORM_PARAM}/${VERSION_PARAM}" def upload_result - if(IsOSS()) + def upload_result_with_version + if(IsOSS()){ upload_result=sh(script: "$WORKSPACE/Tool/build_tools/upload_oss.sh ${ipa_path} ${upload_path}", returnStatus: true, returnStdout: false) - else + upload_result_with_version=sh(script: "$WORKSPACE/Tool/build_tools/upload_oss.sh ${ipa_path} ${upload_path_with_version}", returnStatus: true, returnStdout: false) + } + else{ upload_result=sh(script: "$WORKSPACE/Tool/build_tools/upload_rsync.sh ${ipa_path} ${upload_path}", returnStatus: true, returnStdout: false) - if(upload_result != 0) + upload_result_with_version=sh(script: "$WORKSPACE/Tool/build_tools/upload_rsync.sh ${ipa_path} ${upload_path_with_version}", returnStatus: true, returnStdout: false) + } + if(upload_result != 0 || upload_result_with_version != 0) { def message = "【${PLATFORM_PARAM}】【${VERSION_PARAM}】【Release】【${CHANNEL_PARAM}】上传IPA失败" SendMessageToWechat(message)