From e5aea89599ef9098f27db5c9050208a2368c6bb6 Mon Sep 17 00:00:00 2001 From: Madhura Bhave Date: Wed, 9 Dec 2020 12:20:05 -0800 Subject: [PATCH] Move SDKMAN to a separate job Closes gh-21903 --- ci/pipeline.yml | 19 ++++++++++++++++++- ci/scripts/promote.sh | 2 -- ci/scripts/publish-to-sdkman.sh | 9 +++++++++ ci/tasks/publish-to-sdkman.yml | 11 +++++++++++ 4 files changed, 38 insertions(+), 3 deletions(-) create mode 100755 ci/scripts/publish-to-sdkman.sh create mode 100755 ci/tasks/publish-to-sdkman.yml diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 4e3ba22a091..6e10d02083d 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -658,11 +658,28 @@ jobs: name: generated-changelog/tag tag: generated-changelog/tag body: generated-changelog/changelog.md +- name: publish-to-sdkman + serial: true + plan: + - get: ci-image + - get: git-repo + - get: artifactory-repo + passed: [sync-to-maven-central] + params: + download_artifacts: false + save_build_info: true + - task: publish-to-sdkman + image: ci-image + file: git-repo/ci/tasks/publish-to-sdkman.yml + params: + <<: *sdkman-task-params + RELEASE_TYPE: RELEASE + BRANCH: ((branch)) groups: - name: "builds" jobs: ["build", "jdk11-build", "jdk15-build", "windows-build"] - name: "releases" - jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "sync-to-maven-central"] + jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "sync-to-maven-central", "publish-to-sdkman"] - name: "ci-images" jobs: ["build-ci-images", "detect-docker-updates", "detect-jdk-updates", "detect-ubuntu-image-updates"] - name: "pull-requests" diff --git a/ci/scripts/promote.sh b/ci/scripts/promote.sh index 025720f60ec..cff0f3e86ba 100755 --- a/ci/scripts/promote.sh +++ b/ci/scripts/promote.sh @@ -11,7 +11,5 @@ java -jar /spring-boot-release-scripts.jar distribute $RELEASE_TYPE $BUILD_INFO_ java -jar /spring-boot-release-scripts.jar publishGradlePlugin $RELEASE_TYPE $BUILD_INFO_LOCATION || { exit 1; } -java -jar /spring-boot-release-scripts.jar publishToSdkman $RELEASE_TYPE $version $BRANCH || {exit 1;} - echo "Promotion complete" echo $version > version/version diff --git a/ci/scripts/publish-to-sdkman.sh b/ci/scripts/publish-to-sdkman.sh new file mode 100755 index 00000000000..bbbb1e80ae8 --- /dev/null +++ b/ci/scripts/publish-to-sdkman.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +source $(dirname $0)/common.sh + +version=$( cat artifactory-repo/build-info.json | jq -r '.buildInfo.modules[0].id' | sed 's/.*:.*:\(.*\)/\1/' ) + +java -jar /spring-boot-release-scripts.jar publishToSdkman $RELEASE_TYPE $version $BRANCH || {exit 1;} + +echo "Push to SDKMAN complete" diff --git a/ci/tasks/publish-to-sdkman.yml b/ci/tasks/publish-to-sdkman.yml new file mode 100755 index 00000000000..bd27eea664a --- /dev/null +++ b/ci/tasks/publish-to-sdkman.yml @@ -0,0 +1,11 @@ +--- +platform: linux +inputs: + - name: artifactory-repo +params: + RELEASE_TYPE: + BRANCH: + SDKMAN_CONSUMER_KEY: + SDKMAN_CONSUMER_TOKEN: +run: + path: git-repo/ci/scripts/publish-to-sdkman.sh