root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '2.7.x' into 3.0.x 

Closes gh-38400
This commit is contained in:
Andy Wilkinson 2023-11-20 20:59:56 +00:00
parent 8b5f3f3176 b4348ecf19
commit a1db63b726
4 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ci/parameters.yml
View File

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

3
ci/pipeline.yml
View File

@ -402,6 +402,7 @@ jobs:
timeout: ((task-timeout)) timeout: ((task-timeout))
file: git-repo/ci/tasks/stage.yml file: git-repo/ci/tasks/stage.yml
params: params:
FINAL_RELEASE: ((final-release))
RELEASE_TYPE: M RELEASE_TYPE: M
<<: *gradle-enterprise-task-params <<: *gradle-enterprise-task-params
<<: *docker-hub-task-params <<: *docker-hub-task-params
@ -425,6 +426,7 @@ jobs:
timeout: ((task-timeout)) timeout: ((task-timeout))
file: git-repo/ci/tasks/stage.yml file: git-repo/ci/tasks/stage.yml
params: params:
FINAL_RELEASE: ((final-release))
RELEASE_TYPE: RC RELEASE_TYPE: RC
<<: *gradle-enterprise-task-params <<: *gradle-enterprise-task-params
<<: *docker-hub-task-params <<: *docker-hub-task-params
@ -448,6 +450,7 @@ jobs:
timeout: ((task-timeout)) timeout: ((task-timeout))
file: git-repo/ci/tasks/stage.yml file: git-repo/ci/tasks/stage.yml
params: params:
FINAL_RELEASE: ((final-release))
RELEASE_TYPE: RELEASE RELEASE_TYPE: RELEASE
<<: *gradle-enterprise-task-params <<: *gradle-enterprise-task-params
<<: *docker-hub-task-params <<: *docker-hub-task-params

2
ci/scripts/stage.sh
View File

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

1
ci/tasks/stage.yml
View File

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