fix(ci): SNAPSHOT 版本基于下一版本号,避免与已发布的 release 冲突

- SNAPSHOT 模式:bumpVersion(baseVer) + '-SNAPSHOT',确保高于当前 release
- 解决 Gradle 解析 SNAPSHOT 时优先使用同版本号 release 的问题
这个提交包含在:
XuqmGroup 2026-06-18 12:23:51 +08:00
父节点 f0276bb440
当前提交 6f216bc4c2

14
Jenkinsfile vendored
查看文件

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