Skip to content

Commit b4348ec

Browse files
committed
Don't set next version when staging final version
Closes gh-38399
1 parent 83d1d8e commit b4348ec

File tree

4 files changed

+6
-1
lines changed

4 files changed

+6
-1
lines changed

ci/parameters.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ milestone: "2.7.x"
1212
build-name: "spring-boot"
1313
concourse-url: "https://ci.spring.io"
1414
task-timeout: 2h00m
15+
final-release: false

ci/pipeline.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -519,6 +519,7 @@ jobs:
519519
timeout: ((task-timeout))
520520
file: git-repo/ci/tasks/stage.yml
521521
params:
522+
FINAL_RELEASE: ((final-release))
522523
RELEASE_TYPE: M
523524
<<: *gradle-enterprise-task-params
524525
<<: *docker-hub-task-params
@@ -542,6 +543,7 @@ jobs:
542543
timeout: ((task-timeout))
543544
file: git-repo/ci/tasks/stage.yml
544545
params:
546+
FINAL_RELEASE: ((final-release))
545547
RELEASE_TYPE: RC
546548
<<: *gradle-enterprise-task-params
547549
<<: *docker-hub-task-params
@@ -565,6 +567,7 @@ jobs:
565567
timeout: ((task-timeout))
566568
file: git-repo/ci/tasks/stage.yml
567569
params:
570+
FINAL_RELEASE: ((final-release))
568571
RELEASE_TYPE: RELEASE
569572
<<: *gradle-enterprise-task-params
570573
<<: *docker-hub-task-params

ci/scripts/stage.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ git tag -a "v$stageVersion" -m"Release v$stageVersion" > /dev/null
3838
./gradlew --no-daemon --max-workers=4 -PdeploymentRepository=${repository} build publishAllPublicationsToDeploymentRepository
3939

4040
git reset --hard HEAD^ > /dev/null
41-
if [[ $nextVersion != $snapshotVersion ]]; then
41+
if [[ $FINAL_RELEASE != true && $nextVersion != $snapshotVersion ]]; then
4242
echo "Setting next development version (v$nextVersion)"
4343
sed -i "s/version=$snapshotVersion/version=$nextVersion/" gradle.properties
4444
git add gradle.properties > /dev/null

ci/tasks/stage.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ outputs:
88
params:
99
RELEASE_TYPE:
1010
CI: true
11+
FINAL_RELEASE:
1112
GRADLE_ENTERPRISE_CACHE_URL:
1213
GRADLE_ENTERPRISE_CACHE_USERNAME:
1314
GRADLE_ENTERPRISE_CACHE_PASSWORD:

0 commit comments

Comments
 (0)