diff --git a/Tool/build_env/jenkins_android_release.groovy b/Tool/build_env/jenkins_android_release.groovy index 3f75139fb52..c3bb1fa9bf9 100644 --- a/Tool/build_env/jenkins_android_release.groovy +++ b/Tool/build_env/jenkins_android_release.groovy @@ -6,7 +6,7 @@ def APK_NAME = "NLDBuild.apk" // 构建时候的参数 def CHANNEL_PARAM = params.Channel def DEBUGBUILD_PARAM = params.DebugBuild -def HOTUPDATE_PARAM = params.Enable_Hot_Update +def HOTUPDATE_PARAM = true def AAB_PARAM = params.AAB def OBFUZ = params.Obfuz def DEV_PARAM = IsDev() @@ -14,6 +14,9 @@ def ANDROIDKEYSTORE = "/Users/mayuanzheng/key/phxh_android.keystore" def ANDROIDKEYALIAS = "avery" def UPLOAD_SYMBOL = params.UploadSymbol def PACKAGE_HARDENING = params.PackageHardening +def PackDefaultRes = params.PackDefaultRes +def PackDllRes = params.PackDllRes +def PackConfigRes = params.PackConfigRes // Jenkins 归档地址 def ARTIFACT_URL = "http://${env.PHXH_BUILDER_IP_ADDRESS}:8080/job/${env.JOB_NAME}/" @@ -60,36 +63,28 @@ def ParseBuildLogError(logPath){ } def GetRemote(){ - if('Banshu' == params.Channel) - return 'shenhe'; - // else if('Official' == params.Channel) - // return 'dev' - // else if('TapTap' == params.Channel) - // return 'release/tap' + return 'release/release_1_0_0' + //if('Banshu' == params.Channel) + //return 'shenhe'; + // todo 确认是否切出分支 + if('Official' == params.Channel) + return 'release/official_0_9_0' + else if('TapTap' == params.Channel) + return 'release/tap_0_9_0' // else if('ReleaseTest' == params.Channel) // return 'dev' // else if('Test' == params.Channel) // return 'test' // else if('Stable_Dev' == params.Channel) // return "release/stable_dev" - // else if('Bilibili' == params.Channel) - // return "release/bilibili" + else if('Bilibili' == params.Channel) + return 'release/bilibili_0_9_0' else return 'dev'; } def IsDev() { - if('Banshu' == params.Channel) - return true; - else if('ReleaseTest' == params.Channel) - return true; - // Stable_Dev 使用 release 配置路径,不再作为 Dev 环境 - // else if('Stable_Dev' == params.Channel) - // return true; - else if('Test' == params.Channel) - return true; - else - return true; + return false; } def CheckRemoteBranchExists(repoUrl, branchName) { @@ -318,11 +313,11 @@ pipeline { def parse_log = "../../$log_path" if(params.Build_InitApp == false){ - build_result=sh(script: "$WORKSPACE/Tool/build_tools/hot_update.sh ${VERSION_PARAM} ${PLATFORM_PARAM} ${PROFILE_PARAM} ${CHANNEL_PARAM} ${HOTUPDATE_PARAM} ${DEBUGBUILD_PARAM} ${ANDROIDKEYSTORE} ${ANDROIDKEYALIAS} ${OBFUZ}", returnStatus: true, returnStdout: false) + build_result=sh(script: "$WORKSPACE/Tool/build_tools/hot_update.sh ${VERSION_PARAM} ${PLATFORM_PARAM} ${PROFILE_PARAM} ${CHANNEL_PARAM} ${HOTUPDATE_PARAM} ${DEBUGBUILD_PARAM} ${ANDROIDKEYSTORE} ${ANDROIDKEYALIAS} ${OBFUZ} ${PackDefaultRes} ${PackDllRes} ${PackConfigRes}", returnStatus: true, returnStdout: false) 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}", 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) // 打包失败 if(build_result != 0)