Skip to content

Commit 4723610

Browse files
committed
Use springio/concourse-release-scripts Docker image rather than jar
1 parent 37cb748 commit 4723610

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

ci/images/setup.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ ln -fs /usr/share/zoneinfo/UTC /etc/localtime
1111
dpkg-reconfigure --frontend noninteractive tzdata
1212
rm -rf /var/lib/apt/lists/*
1313
curl https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.4/concourse-java.sh > /opt/concourse-java.sh
14-
curl --output /opt/concourse-release-scripts.jar https://repo.spring.io/release/io/spring/concourse/releasescripts/concourse-release-scripts/0.3.2/concourse-release-scripts-0.3.2.jar
1514

1615
###########################################################
1716
# JAVA

ci/pipeline.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,6 @@ jobs:
263263
download_artifacts: false
264264
save_build_info: true
265265
- task: promote
266-
image: ci-image
267266
file: git-repo/ci/tasks/promote.yml
268267
params:
269268
RELEASE_TYPE: M
@@ -292,7 +291,6 @@ jobs:
292291
download_artifacts: false
293292
save_build_info: true
294293
- task: promote
295-
image: ci-image
296294
file: git-repo/ci/tasks/promote.yml
297295
params:
298296
RELEASE_TYPE: RC
@@ -319,7 +317,6 @@ jobs:
319317
download_artifacts: true
320318
save_build_info: true
321319
- task: promote
322-
image: ci-image
323320
file: git-repo/ci/tasks/promote.yml
324321
params:
325322
RELEASE_TYPE: RELEASE

ci/scripts/promote.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
#!/bin/bash
22
set -e
33

4-
source $(dirname $0)/common.sh
54
CONFIG_DIR=git-repo/ci/config
65

76
version=$( cat artifactory-repo/build-info.json | jq -r '.buildInfo.modules[0].id' | sed 's/.*:.*:\(.*\)/\1/' )
87

98
export BUILD_INFO_LOCATION=$(pwd)/artifactory-repo/build-info.json
109

11-
java -jar /opt/concourse-release-scripts.jar \
10+
java -jar /concourse-release-scripts.jar \
1211
--spring.config.location=${CONFIG_DIR}/release-scripts.yml \
1312
publishToCentral $RELEASE_TYPE $BUILD_INFO_LOCATION artifactory-repo || { exit 1; }
1413

15-
java -jar /opt/concourse-release-scripts.jar \
14+
java -jar /concourse-release-scripts.jar \
1615
--spring.config.location=${CONFIG_DIR}/release-scripts.yml \
1716
promote $RELEASE_TYPE $BUILD_INFO_LOCATION || { exit 1; }
1817

ci/tasks/promote.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
---
22
platform: linux
3+
image_resource:
4+
type: registry-image
5+
source:
6+
repository: springio/concourse-release-scripts
7+
tag: '0.3.4'
8+
username: ((docker-hub-username))
9+
password: ((docker-hub-password))
310
inputs:
411
- name: git-repo
512
- name: artifactory-repo

0 commit comments

Comments
 (0)