Skip to content

Commit 506fbd8

Browse files
committed
Use release notes generator docker image in CI
Closes gh-15160
1 parent ee2d469 commit 506fbd8

File tree

3 files changed

+23
-34
lines changed

3 files changed

+23
-34
lines changed

ci/pipeline.yml

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@ resources:
2727
password: ((github-password))
2828
branch: ((branch))
2929
ignore_paths: ["ci/images/*"]
30-
- name: release-notes-repo
31-
type: git
32-
source:
33-
uri: https://github.com/mbhave/release-notes-generator
34-
branch: master
3530
- name: git-pull-request
3631
type: pull-request
3732
source:
@@ -383,7 +378,6 @@ jobs:
383378
- get: spring-boot-ci-image
384379
- get: git-repo
385380
trigger: false
386-
- get: release-notes-repo
387381
- get: artifactory-repo
388382
trigger: false
389383
passed: [stage-milestone]
@@ -398,26 +392,22 @@ jobs:
398392
ARTIFACTORY_USERNAME: ((artifactory-username))
399393
ARTIFACTORY_PASSWORD: ((artifactory-password))
400394
- task: generate-release-notes
401-
image: spring-boot-ci-image
402395
file: git-repo/ci/tasks/generate-release-notes.yml
403396
params:
404397
RELEASE_TYPE: M
405-
GITHUB_ORGANIZATION: spring-projects
406-
GITHUB_REPO: spring-boot
407398
GITHUB_USERNAME: ((github-username))
408399
GITHUB_PASSWORD: ((github-release-notes-access-token))
409400
- put: github-pre-release
410401
params:
411-
name: generated-release-notes/version
412-
tag: generated-release-notes/version
413-
body: generated-release-notes/body
402+
name: generated-release-notes/tag
403+
tag: generated-release-notes/tag
404+
body: generated-release-notes/release-notes.md
414405
- name: promote-rc
415406
serial: true
416407
plan:
417408
- get: spring-boot-ci-image
418409
- get: git-repo
419410
trigger: false
420-
- get: release-notes-repo
421411
- get: artifactory-repo
422412
trigger: false
423413
passed: [stage-rc]
@@ -432,26 +422,22 @@ jobs:
432422
ARTIFACTORY_USERNAME: ((artifactory-username))
433423
ARTIFACTORY_PASSWORD: ((artifactory-password))
434424
- task: generate-release-notes
435-
image: spring-boot-ci-image
436425
file: git-repo/ci/tasks/generate-release-notes.yml
437426
params:
438427
RELEASE_TYPE: RC
439-
GITHUB_ORGANIZATION: spring-projects
440-
GITHUB_REPO: spring-boot
441428
GITHUB_USERNAME: ((github-username))
442429
GITHUB_PASSWORD: ((github-release-notes-access-token))
443430
- put: github-pre-release
444431
params:
445-
name: generated-release-notes/version
446-
tag: generated-release-notes/version
447-
body: generated-release-notes/body
432+
name: generated-release-notes/tag
433+
tag: generated-release-notes/tag
434+
body: generated-release-notes/release-notes.md
448435
- name: promote-release
449436
serial: true
450437
plan:
451438
- get: spring-boot-ci-image
452439
- get: git-repo
453440
trigger: false
454-
- get: release-notes-repo
455441
- get: artifactory-repo
456442
trigger: false
457443
passed: [stage-release]
@@ -468,19 +454,16 @@ jobs:
468454
BINTRAY_SUBJECT: ((bintray-subject))
469455
BINTRAY_REPO: ((bintray-repo))
470456
- task: generate-release-notes
471-
image: spring-boot-ci-image
472457
file: git-repo/ci/tasks/generate-release-notes.yml
473458
params:
474459
RELEASE_TYPE: RELEASE
475-
GITHUB_ORGANIZATION: spring-projects
476-
GITHUB_REPO: spring-boot
477460
GITHUB_USERNAME: ((github-username))
478461
GITHUB_PASSWORD: ((github-release-notes-access-token))
479462
- put: github-release
480463
params:
481-
name: generated-release-notes/version
482-
tag: generated-release-notes/version
483-
body: generated-release-notes/body
464+
name: generated-release-notes/tag
465+
tag: generated-release-notes/tag
466+
body: generated-release-notes/release-notes.md
484467
- name: sync-to-maven-central
485468
serial: true
486469
plan:

ci/scripts/generate-release-notes.sh

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,18 @@ set -e
44
source $(dirname $0)/common.sh
55

66
version=$( cat version/version )
7+
78
milestone=$( echo $version )
89
if [[ $RELEASE_TYPE = "RELEASE" ]]; then
910
milestone=${version%.RELEASE}
1011
fi
11-
milestone_number=$( curl -s "https://api.github.com/repos/${GITHUB_ORGANIZATION}/${GITHUB_REPO}/milestones" -u ${GITHUB_USERNAME}:${GITHUB_PASSWORD} | jq -r --arg MILESTONE "${milestone}" '.[] | select(.title == $MILESTONE) | .number')
1212

13-
pushd release-notes-repo > /dev/null
14-
run_maven clean install
15-
java -jar -Dreleasenotes.github.organization=${GITHUB_ORGANIZATION} -Dreleasenotes.github.name=${GITHUB_REPO} target/github-release-notes-generator-0.0.1-SNAPSHOT.jar "${milestone_number}" release-notes.md
16-
popd > /dev/null
13+
java -jar /github-release-notes-generator.jar \
14+
--releasenotes.github.username=${GITHUB_USERNAME} \
15+
--releasenotes.github.password=${GITHUB_TOKEN} \
16+
--releasenotes.github.organization=spring-projects \
17+
--releasenotes.github.repository=spring-boot \
18+
${milestone} generated-release-notes/release-notes.md
1719

18-
cat release-notes-repo/release-notes.md > generated-release-notes/body
19-
echo v${version} > generated-release-notes/version
20+
echo ${version} > generated-release-notes/version
21+
echo v${version} > generated-release-notes/tag

ci/tasks/generate-release-notes.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
---
22
platform: linux
3+
image_resource:
4+
type: docker-image
5+
source:
6+
repository: springio/github-release-notes-generator
7+
tag: '0.0.2'
38
inputs:
49
- name: git-repo
5-
- name: release-notes-repo
610
- name: version
711
outputs:
812
- name: generated-release-notes

0 commit comments

Comments
 (0)