diff --git a/Jenkinsfile b/Jenkinsfile index 522b409..a094250 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -103,9 +103,9 @@ pipeline { def newVer if (params.SNAPSHOT) { - // SNAPSHOT:基础版本 + -SNAPSHOT,不写回 gradle.properties - newVer = baseVer + '-SNAPSHOT' - echo "SNAPSHOT: ${propName} → ${newVer}" + // SNAPSHOT:基于下一版本 + -SNAPSHOT,确保高于当前 release + newVer = bumpVersion(baseVer) + '-SNAPSHOT' + echo "SNAPSHOT: ${propName} → ${newVer} (base: ${baseVer})" } else { // Release:升级版本号,写回 gradle.properties newVer = bumpVersion(baseVer) @@ -135,7 +135,7 @@ pipeline { // sdk-bugcollect-plugin 是 JVM Gradle 插件,没有 assembleRelease 任务 def aarModules = modules.findAll { it != 'sdk-bugcollect-plugin' } if (aarModules.isEmpty()) { - echo "没有 AAR 模块需要构建" + bat 'chcp 65001 >nul && echo 没有AAR模块需要构建' } else { def moduleTasks = aarModules.collect { ":${it}:assembleRelease" }.join(' ') bat "gradlew.bat ${moduleTasks} ${env.VERSION_ARGS} --no-daemon" @@ -173,9 +173,9 @@ pipeline { post { success { - echo "Android SDK 构建成功" - echo "发布版本:\n${env.PUBLISHED_VERSIONS}" + bat 'chcp 65001 >nul && echo Android SDK 构建成功' + bat "chcp 65001 >nul && echo 发布版本: ${env.PUBLISHED_VERSIONS}" } - failure { echo "Android SDK 构建失败" } + failure { bat 'chcp 65001 >nul && echo Android SDK 构建失败' } } }