diff --git a/ci/pipeline.yml b/ci/pipeline.yml index cf3d35883f..0523ed56ae 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -629,7 +629,7 @@ jobs: plan: - get: ci-image - get: git-repo - resource: homebrew-tap-repo + - get: homebrew-tap-repo - get: artifactory-repo passed: [sync-to-maven-central] params: @@ -640,10 +640,9 @@ jobs: file: git-repo/ci/tasks/update-homebrew-tap.yml params: LATEST_GA: false - - put: git-repo - resource: homebrew-tap-repo + - put: homebrew-tap-repo params: - repository: updated-repo + repository: updated-homebrew-tap-repo groups: - name: "builds" jobs: ["build", "jdk11-build", "jdk15-build", "windows-build"] diff --git a/ci/scripts/update-homebrew-tap.sh b/ci/scripts/update-homebrew-tap.sh index 8c0baeec3c..a7a570b203 100755 --- a/ci/scripts/update-homebrew-tap.sh +++ b/ci/scripts/update-homebrew-tap.sh @@ -3,12 +3,11 @@ set -e version=$( cat artifactory-repo/build-info.json | jq -r '.buildInfo.modules[0].id' | sed 's/.*:.*:\(.*\)/\1/' ) -git clone git-repo updated-repo > /dev/null +git clone homebrew-tap-repo updated-homebrew-tap-repo > /dev/null if [[ $LATEST_GA = true ]]; then -pushd updated-repo > /dev/null - cd homebrew-tap - wget https://repo.spring.io/libs-release-local/org/springframework/boot/spring-boot-cli/${version}/spring-boot-cli-${version}-homebrew.rb +pushd updated-homebrew-tap-repo > /dev/null + curl https://repo.spring.io/libs-release-local/org/springframework/boot/spring-boot-cli/${version}/spring-boot-cli-${version}-homebrew.rb --output spring-boot-cli-${version}-homebrew.rb rm spring-boot.rb mv spring-boot-cli-*.rb spring-boot.rb git config user.name "Spring Buildmaster" > /dev/null @@ -17,4 +16,4 @@ pushd updated-repo > /dev/null git commit -m "Upgrade to Spring Boot ${version}" > /dev/null echo "DONE" popd > /dev/null -fi \ No newline at end of file +fi diff --git a/ci/tasks/update-homebrew-tap.yml b/ci/tasks/update-homebrew-tap.yml index 4caca3bdf5..0008317be0 100755 --- a/ci/tasks/update-homebrew-tap.yml +++ b/ci/tasks/update-homebrew-tap.yml @@ -2,9 +2,10 @@ platform: linux inputs: - name: git-repo + - name: homebrew-tap-repo - name: artifactory-repo outputs: - - name: updated-repo + - name: updated-homebrew-tap-repo params: LATEST_GA: run: