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

Merge branch '2.6.x' into 2.7.x 

Closes gh-31073
This commit is contained in:
Andy Wilkinson 2022-05-17 10:01:04 +01:00
parent 882eb9776c dabf94360d
commit aad79aaeb9
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ci/pipeline.yml
View File

@ -13,8 +13,7 @@ anchors:
GRADLE_ENTERPRISE_CACHE_USERNAME: ((gradle_enterprise_cache_user.username)) GRADLE_ENTERPRISE_CACHE_USERNAME: ((gradle_enterprise_cache_user.username))
GRADLE_ENTERPRISE_CACHE_PASSWORD: ((gradle_enterprise_cache_user.password)) GRADLE_ENTERPRISE_CACHE_PASSWORD: ((gradle_enterprise_cache_user.password))
docker-hub-task-params: &docker-hub-task-params docker-hub-task-params: &docker-hub-task-params
DOCKER_HUB_USERNAME: ((docker-hub-username)) DOCKER_HUB_MIRROR: ((docker-hub-mirror))
DOCKER_HUB_PASSWORD: ((docker-hub-password))
github-task-params: &github-task-params github-task-params: &github-task-params
GITHUB_REPO: spring-boot GITHUB_REPO: spring-boot
GITHUB_ORGANIZATION: spring-projects GITHUB_ORGANIZATION: spring-projects

4
ci/scripts/common.sh
View File

@ -5,8 +5,4 @@ if [[ -d $PWD/embedmongo && ! -d $HOME/.embedmongo ]]; then
ln -s "$PWD/embedmongo" "$HOME/.embedmongo" ln -s "$PWD/embedmongo" "$HOME/.embedmongo"
fi fi
if [[ -n $DOCKER_HUB_USERNAME ]]; then
docker login -u $DOCKER_HUB_USERNAME -p $DOCKER_HUB_PASSWORD
fi
cleanup_maven_repo "org.springframework.boot" cleanup_maven_repo "org.springframework.boot"