Skip to content

Commit cdc6cfc

Browse files
committed
Publish release notes after artifacts have been promoted
Closes gh-14604
1 parent febaf15 commit cdc6cfc

File tree

6 files changed

+34
-33
lines changed

6 files changed

+34
-33
lines changed

ci/pipeline.yml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,6 @@ jobs:
312312
- get: spring-boot-ci-image
313313
- get: git-repo
314314
trigger: false
315-
- get: release-notes-repo
316315
- task: stage
317316
image: spring-boot-ci-image
318317
file: git-repo/ci/tasks/stage.yml
@@ -325,22 +324,12 @@ jobs:
325324
- put: git-repo
326325
params:
327326
repository: stage-git-repo
328-
- task: publish-release-notes
329-
image: spring-boot-ci-image
330-
file: git-repo/ci/tasks/publish-release-notes.yml
331-
params:
332-
RELEASE_TYPE: M
333-
GITHUB_ORGANIZATION: spring-projects
334-
GITHUB_REPO: spring-boot
335-
GITHUB_USERNAME: ((github-username))
336-
GITHUB_PASSWORD: ((github-release-notes-access-token))
337327
- name: stage-rc
338328
serial: true
339329
plan:
340330
- get: spring-boot-ci-image
341331
- get: git-repo
342332
trigger: false
343-
- get: release-notes-repo
344333
- task: stage
345334
image: spring-boot-ci-image
346335
file: git-repo/ci/tasks/stage.yml
@@ -353,22 +342,12 @@ jobs:
353342
- put: git-repo
354343
params:
355344
repository: stage-git-repo
356-
- task: publish-release-notes
357-
image: spring-boot-ci-image
358-
file: git-repo/ci/tasks/publish-release-notes.yml
359-
params:
360-
RELEASE_TYPE: RC
361-
GITHUB_ORGANIZATION: spring-projects
362-
GITHUB_REPO: spring-boot
363-
GITHUB_USERNAME: ((github-username))
364-
GITHUB_PASSWORD: ((github-release-notes-access-token))
365345
- name: stage-release
366346
serial: true
367347
plan:
368348
- get: spring-boot-ci-image
369349
- get: git-repo
370350
trigger: false
371-
- get: release-notes-repo
372351
- task: stage
373352
image: spring-boot-ci-image
374353
file: git-repo/ci/tasks/stage.yml
@@ -381,21 +360,13 @@ jobs:
381360
- put: git-repo
382361
params:
383362
repository: stage-git-repo
384-
- task: publish-release-notes
385-
image: spring-boot-ci-image
386-
file: git-repo/ci/tasks/publish-release-notes.yml
387-
params:
388-
RELEASE_TYPE: RELEASE
389-
GITHUB_ORGANIZATION: spring-projects
390-
GITHUB_REPO: spring-boot
391-
GITHUB_USERNAME: ((github-username))
392-
GITHUB_PASSWORD: ((github-release-notes-access-token))
393363
- name: promote-milestone
394364
serial: true
395365
plan:
396366
- get: spring-boot-ci-image
397367
- get: git-repo
398368
trigger: false
369+
- get: release-notes-repo
399370
- get: artifactory-repo
400371
trigger: false
401372
passed: [stage-milestone]
@@ -409,12 +380,22 @@ jobs:
409380
ARTIFACTORY_SERVER: ((artifactory-server))
410381
ARTIFACTORY_USERNAME: ((artifactory-username))
411382
ARTIFACTORY_PASSWORD: ((artifactory-password))
383+
- task: publish-release-notes
384+
image: spring-boot-ci-image
385+
file: git-repo/ci/tasks/publish-release-notes.yml
386+
params:
387+
RELEASE_TYPE: M
388+
GITHUB_ORGANIZATION: spring-projects
389+
GITHUB_REPO: spring-boot
390+
GITHUB_USERNAME: ((github-username))
391+
GITHUB_PASSWORD: ((github-release-notes-access-token))
412392
- name: promote-rc
413393
serial: true
414394
plan:
415395
- get: spring-boot-ci-image
416396
- get: git-repo
417397
trigger: false
398+
- get: release-notes-repo
418399
- get: artifactory-repo
419400
trigger: false
420401
passed: [stage-rc]
@@ -428,12 +409,22 @@ jobs:
428409
ARTIFACTORY_SERVER: ((artifactory-server))
429410
ARTIFACTORY_USERNAME: ((artifactory-username))
430411
ARTIFACTORY_PASSWORD: ((artifactory-password))
412+
- task: publish-release-notes
413+
image: spring-boot-ci-image
414+
file: git-repo/ci/tasks/publish-release-notes.yml
415+
params:
416+
RELEASE_TYPE: RC
417+
GITHUB_ORGANIZATION: spring-projects
418+
GITHUB_REPO: spring-boot
419+
GITHUB_USERNAME: ((github-username))
420+
GITHUB_PASSWORD: ((github-release-notes-access-token))
431421
- name: promote-release
432422
serial: true
433423
plan:
434424
- get: spring-boot-ci-image
435425
- get: git-repo
436426
trigger: false
427+
- get: release-notes-repo
437428
- get: artifactory-repo
438429
trigger: false
439430
passed: [stage-release]
@@ -449,6 +440,15 @@ jobs:
449440
ARTIFACTORY_PASSWORD: ((artifactory-password))
450441
BINTRAY_SUBJECT: ((bintray-subject))
451442
BINTRAY_REPO: ((bintray-repo))
443+
- task: publish-release-notes
444+
image: spring-boot-ci-image
445+
file: git-repo/ci/tasks/publish-release-notes.yml
446+
params:
447+
RELEASE_TYPE: RELEASE
448+
GITHUB_ORGANIZATION: spring-projects
449+
GITHUB_REPO: spring-boot
450+
GITHUB_USERNAME: ((github-username))
451+
GITHUB_PASSWORD: ((github-release-notes-access-token))
452452
- name: sync-to-maven-central
453453
serial: true
454454
plan:

ci/scripts/promote.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,4 @@ fi
6666

6767

6868
echo "Promotion complete"
69+
echo $version > version/version

ci/scripts/publish-release-notes.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -e
33

44
source $(dirname $0)/common.sh
55

6-
milestone=$( cat version/stageVersion )
6+
milestone=$( cat version/version )
77
if [[ $RELEASE_TYPE = "RELEASE" ]]; then
88
milestone=${milestone%.RELEASE}
99
fi

ci/scripts/stage.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,3 @@ fi;
5151
echo "DONE"
5252

5353
popd > /dev/null
54-
echo $stageVersion > version/stageVersion

ci/tasks/promote.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ platform: linux
33
inputs:
44
- name: git-repo
55
- name: artifactory-repo
6+
outputs:
7+
- name: version
68
params:
79
RELEASE_TYPE:
810
ARTIFACTORY_SERVER:

ci/tasks/stage.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ inputs:
55
outputs:
66
- name: stage-git-repo
77
- name: distribution-repository
8-
- name: version
98
params:
109
RELEASE_TYPE:
1110
caches:

0 commit comments

Comments
 (0)