@@ -192,7 +192,7 @@ def scanCode
192
192
void defaultInit () {
193
193
// Default to using bump2version
194
194
bumpVersion = { isDevRelease ->
195
- newVersion = getNewVersion(isDevRelease, true )
195
+ newVersion = getNewVersion(isDevRelease)
196
196
// Set an env var with the new version
197
197
env. NEW_SDK_VERSION = newVersion
198
198
doVersionBump(isDevRelease, newVersion)
@@ -202,9 +202,9 @@ void defaultInit() {
202
202
sh " bump2version --new-version ${ newVersion} ${ allowDirty ? '--allow-dirty': ''} ${ isDevRelease ? '--no-commit' : '--tag --tag-message "Release {new_version}"'} patch"
203
203
}
204
204
205
- getNewVersion = { isDevRelease , includeBuildMeta ->
205
+ getNewVersion = { isDevRelease ->
206
206
// Get a staging or target version and customize with lang specific requirements
207
- return customizeVersion(isDevRelease ? getDevVersion(includeBuildMeta ) : getTargetVersion())
207
+ return customizeVersion(isDevRelease ? getDevVersion() : getTargetVersion())
208
208
}
209
209
210
210
getTargetVersion = {
@@ -218,19 +218,20 @@ void defaultInit() {
218
218
return version. trim()
219
219
}
220
220
221
- getDevVersion = { includeBuildMeta ->
221
+ getDevVersion = {
222
222
devVersion = getTargetVersion()
223
223
if (devVersion ==~ / ${env.SVRE_RELEASE}/ ) {
224
- // For a release (e.g. 1.0.0) make a -dev pre-release (e.g. 1.0.0-devTS )
225
- devVersion + = " -dev ${ currentBuild.startTimeInMillis } "
224
+ // For a release (e.g. 1.0.0) use a hyphen separator (e.g. 1.0.0-dev )
225
+ devVersion + = " -"
226
226
} else if (devVersion ==~ / ${env.SVRE_PRE_RELEASE}/ ) {
227
- // For a pre-release (e.g. 1.0.0-b7), add .dev identifier (e.g. 1.0.0-b7.devTS)
228
- devVersion + = " .dev${ currentBuild.startTimeInMillis} "
229
- }
230
- if (includeBuildMeta) {
231
- // Add uniqueness and build metadata when requested to dev build versions
232
- devVersion + = " +${ commitHash} .${ currentBuild.number} "
227
+ // For a pre-release (e.g. 1.0.0-b7), add dot separator (e.g. 1.0.0-b7.dev)
228
+ devVersion + = " ."
233
229
}
230
+ // Now add dev identifier (a number is required by some package managers)
231
+ devVersion + = " dev0"
232
+ // Add uniqueness with build metadata to dev build versions
233
+ devVersion + = " +git${ commitHash} .${ currentBuild.startTimeInMillis} .${ currentBuild.number} "
234
+
234
235
return devVersion
235
236
}
236
237
0 commit comments