File tree Expand file tree Collapse file tree 6 files changed +10
-23
lines changed Expand file tree Collapse file tree 6 files changed +10
-23
lines changed Original file line number Diff line number Diff line change @@ -31,7 +31,6 @@ RUN apt-get update && \
3131 apt-get clean
3232
3333ADD "https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v$CONCOURSE_JAVA_SCRIPTS_VERSION/concourse-java.sh" /opt/
34- ADD "https://repo.spring.io/ui/native/snapshot/io/spring/concourse/releasescripts/concourse-release-scripts/$CONCOURSE_RELEASE_SCRIPTS_VERSION/concourse-release-scripts-$CONCOURSE_RELEASE_SCRIPTS_VERSION.jar" /opt/
3534
3635RUN cd /usr/local/bin && curl -L "https://github.com/cloudfoundry-incubator/credhub-cli/releases/download/$CREDHUB_CLI_VERSION/credhub-linux-$CREDHUB_CLI_VERSION.tgz" | tar xz
3736
Original file line number Diff line number Diff line change @@ -187,7 +187,6 @@ jobs:
187187 file : git-repo/ci/tasks/promote.yml
188188 vars :
189189 release-type : M
190- ci-image-tag : ((ci-image-tag))
191190
192191 - name : promote-rc
193192 serial : true
@@ -202,7 +201,6 @@ jobs:
202201 file : git-repo/ci/tasks/promote.yml
203202 vars :
204203 release-type : RC
205- ci-image-tag : ((ci-image-tag))
206204
207205 - name : promote-release
208206 serial : true
@@ -217,7 +215,6 @@ jobs:
217215 file : git-repo/ci/tasks/promote.yml
218216 vars :
219217 release-type : RELEASE
220- ci-image-tag : ((ci-image-tag))
221218
222219 - name : sync-to-maven-central
223220 serial : true
@@ -230,8 +227,6 @@ jobs:
230227 save_build_info : true
231228 - task : sync-to-maven-central
232229 file : git-repo/ci/tasks/sync-to-maven-central.yml
233- vars :
234- ci-image-tag : ((ci-image-tag))
235230
236231resource_types :
237232 - name : artifactory-resource
Original file line number Diff line number Diff line change 11#! /bin/bash
22set -euo pipefail
33
4- # shellcheck source=scripts/common.sh
5- source $( dirname $0 ) /common.sh
4+ readonly BUILD_INFO_LOCATION= " $( pwd ) /artifactory-repo/build-info.json "
5+ readonly VERSION= $( jq -r ' .buildInfo.modules[0].id ' < " $BUILD_INFO_LOCATION " | sed ' s/.*:.*:\(.*\)/\1/ ' )
66
7- version=$( cat artifactory-repo/build-info.json | jq -r ' .buildInfo.modules[0].id' | sed ' s/.*:.*:\(.*\)/\1/' )
8- export BUILD_INFO_LOCATION=$( pwd) /artifactory-repo/build-info.json
9-
10- java -jar /opt/concourse-release-scripts* .jar promote $RELEASE_TYPE $BUILD_INFO_LOCATION
7+ java -jar /concourse-release-scripts.jar promote " $RELEASE_TYPE " " $BUILD_INFO_LOCATION "
118
129echo " Promotion complete"
13- echo $version > version/version
10+ echo " $VERSION " > version/version
Original file line number Diff line number Diff line change @@ -4,8 +4,8 @@ set -euo pipefail
44readonly BUILD_INFO_LOCATION=" $( pwd) /artifactory-repo/build-info.json"
55readonly CONFIG_DIR=" $( pwd) /git-repo/ci/config"
66
7- java -jar /opt/ concourse-release-scripts* .jar \
8- --spring.config.location=" ${ CONFIG_DIR} /release-scripts.yml" \
7+ java -jar /concourse-release-scripts.jar \
8+ --spring.config.location=" $CONFIG_DIR /release-scripts.yml" \
99 publishToCentral ' RELEASE' " $BUILD_INFO_LOCATION " " artifactory-repo"
1010
1111echo " Sync complete"
Original file line number Diff line number Diff line change @@ -3,10 +3,8 @@ platform: linux
33image_resource :
44 type : registry-image
55 source :
6- repository : ((corporate-harbor-registry))/((dockerhub-organization))/app-broker-ci
7- username : ((corporate-harbor-robot-account.username))
8- password : ((corporate-harbor-robot-account.password))
9- tag : ((ci-image-tag))
6+ repository : ((dockerhub-mirror-registry))/springio/concourse-release-scripts
7+ tag : ' 0.3.4'
108inputs :
119 - name : git-repo
1210 - name : artifactory-repo
Original file line number Diff line number Diff line change @@ -3,10 +3,8 @@ platform: linux
33image_resource :
44 type : registry-image
55 source :
6- repository : ((corporate-harbor-registry))/((dockerhub-organization))/app-broker-ci
7- username : ((corporate-harbor-robot-account.username))
8- password : ((corporate-harbor-robot-account.password))
9- tag : ((ci-image-tag))
6+ repository : ((dockerhub-mirror-registry))/springio/concourse-release-scripts
7+ tag : ' 0.3.4'
108inputs :
119 - name : git-repo
1210 - name : artifactory-repo
You can’t perform that action at this time.
0 commit comments