Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.1.x' into 2.2.x

Browse Source 
Closes gh-20801
This commit is contained in:
Madhura Bhave
2020-04-01 18:35:10 -07:00
parent 60311af19f 5901b3fcd0
commit d1ef19615c
6 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ci/scripts/create-pull-request.sh
View File

@@ -2,6 +2,7 @@
set -e
if [[ -f commit-details/message ]]; then
ISSUE_TITLE="$(cat commit-details/message)"
curl \
-s \
-u ${GITHUB_USERNAME}:${GITHUB_PASSWORD} \

10
ci/scripts/detect-docker-updates.sh
View File

@@ -1,7 +1,9 @@
#!/bin/bash
existing_tasks=$( curl -s https://api.github.com/repos/${GITHUB_ORGANIZATION}/${GITHUB_REPO}/pulls\?labels\=type:%20task\&state\=open\&creator\=spring-buildmaster )
existing_upgrade_issues=$( echo "$existing_tasks" | jq -c --arg TITLE "$ISSUE_TITLE" '.[] | select(.title==$TITLE)' )
latest_version=$(curl -I -s https://github.com/docker/docker-ce/releases/latest | grep "location:" | awk '{n=split($0, parts, "/"); print substr(parts[n],2);}' | awk '{$1=$1;print}' | tr -d '\r' | tr -d '\n' )
title_prefix="Upgrade CI to Docker"
existing_upgrade_issues=$( curl -s https://api.github.com/repos/spring-projects/spring-boot/issues\?labels\=type:%20task\&state\=open\&creator\=spring-buildmaster | jq -c --arg TITLE_PREFIX "$title_prefix" '.[] | select(.pull_request != null) | select(.title | startswith($TITLE_PREFIX))' )
if [[ ${existing_upgrade_issues} = "" ]]; then
git clone git-repo git-repo-updated > /dev/null
@@ -11,8 +13,6 @@ else
exit 0
fi
latest_version=$(curl -I -s https://github.com/docker/docker-ce/releases/latest | grep "location:" | awk '{n=split($0, parts, "/"); print substr(parts[n],2);}' | awk '{$1=$1;print}' | tr -d '\r' | tr -d '\n' )
if [[ $latest_version =~ (beta|rc) ]]; then
echo "Skip pre-release versions"
exit 0;
@@ -31,7 +31,7 @@ git config user.name "Spring Buildmaster" > /dev/null
git config user.email "buildmaster@springframework.org" > /dev/null
sed -i "s/version=.*/version=\"$latest_version\"/" ci/images/get-docker-url.sh
git add ci/images/get-docker-url.sh > /dev/null
commit_message="Upgrade to Docker $latest_version in CI"
commit_message="$title_prefix $latest_version"
git commit -m "$commit_message" > /dev/null
popd
echo ${commit_message} > commit-details/message