Browse Source

Don't set next version when staging final version

Closes gh-38399
pull/38403/head
Andy Wilkinson 2 years ago
parent
commit
b4348ecf19
  1. 1
      ci/parameters.yml
  2. 3
      ci/pipeline.yml
  3. 2
      ci/scripts/stage.sh
  4. 1
      ci/tasks/stage.yml

1
ci/parameters.yml

@ -12,3 +12,4 @@ milestone: "2.7.x" @@ -12,3 +12,4 @@ milestone: "2.7.x"
build-name: "spring-boot"
concourse-url: "https://ci.spring.io"
task-timeout: 2h00m
final-release: false

3
ci/pipeline.yml

@ -519,6 +519,7 @@ jobs: @@ -519,6 +519,7 @@ jobs:
timeout: ((task-timeout))
file: git-repo/ci/tasks/stage.yml
params:
FINAL_RELEASE: ((final-release))
RELEASE_TYPE: M
<<: *gradle-enterprise-task-params
<<: *docker-hub-task-params
@ -542,6 +543,7 @@ jobs: @@ -542,6 +543,7 @@ jobs:
timeout: ((task-timeout))
file: git-repo/ci/tasks/stage.yml
params:
FINAL_RELEASE: ((final-release))
RELEASE_TYPE: RC
<<: *gradle-enterprise-task-params
<<: *docker-hub-task-params
@ -565,6 +567,7 @@ jobs: @@ -565,6 +567,7 @@ jobs:
timeout: ((task-timeout))
file: git-repo/ci/tasks/stage.yml
params:
FINAL_RELEASE: ((final-release))
RELEASE_TYPE: RELEASE
<<: *gradle-enterprise-task-params
<<: *docker-hub-task-params

2
ci/scripts/stage.sh

@ -38,7 +38,7 @@ git tag -a "v$stageVersion" -m"Release v$stageVersion" > /dev/null @@ -38,7 +38,7 @@ git tag -a "v$stageVersion" -m"Release v$stageVersion" > /dev/null
./gradlew --no-daemon --max-workers=4 -PdeploymentRepository=${repository} build publishAllPublicationsToDeploymentRepository
git reset --hard HEAD^ > /dev/null
if [[ $nextVersion != $snapshotVersion ]]; then
if [[ $FINAL_RELEASE != true && $nextVersion != $snapshotVersion ]]; then
echo "Setting next development version (v$nextVersion)"
sed -i "s/version=$snapshotVersion/version=$nextVersion/" gradle.properties
git add gradle.properties > /dev/null

1
ci/tasks/stage.yml

@ -8,6 +8,7 @@ outputs: @@ -8,6 +8,7 @@ outputs:
params:
RELEASE_TYPE:
CI: true
FINAL_RELEASE:
GRADLE_ENTERPRISE_CACHE_URL:
GRADLE_ENTERPRISE_CACHE_USERNAME:
GRADLE_ENTERPRISE_CACHE_PASSWORD:

Loading…
Cancel
Save