Skip to content

Commit 12dda45

Browse files
authored
fix version change prompt (#1830)
1 parent 1dba658 commit 12dda45

File tree

1 file changed

+15
-24
lines changed

1 file changed

+15
-24
lines changed

.ci/release/Jenkinsfile

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -108,34 +108,25 @@ pipeline {
108108
}
109109
}
110110
}
111-
stage('Review project version') {
111+
stage('Set release version') {
112112
steps {
113113
dir("${BASE_DIR}"){
114114
script {
115-
def ver = mvnVersion(showQualifiers: true)
116-
def should_continue = input(message: "Current version is ${ver}", parameters: [
117-
[
118-
$class: 'ChoiceParameterDefinition',
119-
name: "You are about to release version ${ver - '-SNAPSHOT'}. Do you wish to update the version?",
120-
"choices": ["Yes", "No"],
121-
description: "Selecting 'Yes' will allow you to select the new version in the next step."
122-
]
123-
])
124-
if (should_continue == 'Yes'){
125-
def new_version = input(message: "Please enter version to change to:", parameters:
126-
[
127-
[
128-
$class: 'StringParameterDefinition',
129-
defaultValue: "${ver}",
130-
description: 'We will update the project version in all pom.xml files. Set this to your desired <release-version>-SNAPSHOT (for example 1.2.3-SNAPSHOT if you want to release version 1.2.3).', name: 'New Version'
131-
]
132-
]
133-
)
134-
sh(label: "mavenVersionUpdate", script: "./mvnw --batch-mode release:update-versions -DdevelopmentVersion=${new_version}")
135-
sh(script: "git commit -a -m 'Version bump'")
136-
gitPush()
115+
def snapshot_version = mvnVersion(showQualifiers: true)
116+
def release_version = snapshot_version.minus('-SNAPSHOT')
117+
def user_release_version = input(message: "Please enter version to release:", parameters: [[
118+
$class: 'StringParameterDefinition',
119+
name: 'Release version',
120+
defaultValue: "${release_version}",
121+
description: "Current project version is ${snapshot_version}, will be released as ${release_version} if unchanged. Input release version without '-SNAPSHOT' suffix"
122+
]])
123+
if( release_version.equals(user_release_version) ) {
124+
echo "changing project version '${snapshot_version}' not required to release ${release_version}"
137125
} else {
138-
echo "Skipping version update"
126+
echo "changing project version from '${snapshot_version}' to '${user_release_version}' to prepare release ${user_release_version}."
127+
sh(label: "mavenVersionUpdate", script: "./mvnw --batch-mode release:update-versions -DdevelopmentVersion=${user_release_version}-SNAPSHOT")
128+
sh(script: "git commit -a -m 'Version bump ${ver}'")
129+
gitPush()
139130
}
140131
}
141132
}

0 commit comments

Comments
 (0)