mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '2.2.x' into 2.3.x
Closes gh-23495
This commit is contained in:
commit
e077ee4d63
@ -478,17 +478,17 @@ jobs:
|
||||
params:
|
||||
RELEASE_TYPE: M
|
||||
<<: *artifactory-task-params
|
||||
- task: generate-release-notes
|
||||
file: git-repo/ci/tasks/generate-release-notes.yml
|
||||
- task: generate-changelog
|
||||
file: git-repo/ci/tasks/generate-changelog.yml
|
||||
params:
|
||||
RELEASE_TYPE: M
|
||||
GITHUB_USERNAME: ((github-username))
|
||||
GITHUB_TOKEN: ((github-ci-release-token))
|
||||
- put: github-pre-release
|
||||
params:
|
||||
name: generated-release-notes/tag
|
||||
tag: generated-release-notes/tag
|
||||
body: generated-release-notes/release-notes.md
|
||||
name: generated-changelog/tag
|
||||
tag: generated-changelog/tag
|
||||
body: generated-changelog/changelog.md
|
||||
- name: promote-rc
|
||||
serial: true
|
||||
plan:
|
||||
@ -507,17 +507,17 @@ jobs:
|
||||
params:
|
||||
RELEASE_TYPE: RC
|
||||
<<: *artifactory-task-params
|
||||
- task: generate-release-notes
|
||||
file: git-repo/ci/tasks/generate-release-notes.yml
|
||||
- task: generate-changelog
|
||||
file: git-repo/ci/tasks/generate-changelog.yml
|
||||
params:
|
||||
RELEASE_TYPE: RC
|
||||
GITHUB_USERNAME: ((github-username))
|
||||
GITHUB_TOKEN: ((github-ci-release-token))
|
||||
- put: github-pre-release
|
||||
params:
|
||||
name: generated-release-notes/tag
|
||||
tag: generated-release-notes/tag
|
||||
body: generated-release-notes/release-notes.md
|
||||
name: generated-changelog/tag
|
||||
tag: generated-changelog/tag
|
||||
body: generated-changelog/changelog.md
|
||||
- name: promote-release
|
||||
serial: true
|
||||
plan:
|
||||
@ -554,17 +554,17 @@ jobs:
|
||||
params:
|
||||
<<: *bintray-task-params
|
||||
<<: *sonatype-task-params
|
||||
- task: generate-release-notes
|
||||
file: git-repo/ci/tasks/generate-release-notes.yml
|
||||
- task: generate-changelog
|
||||
file: git-repo/ci/tasks/generate-changelog.yml
|
||||
params:
|
||||
RELEASE_TYPE: RELEASE
|
||||
GITHUB_USERNAME: ((github-username))
|
||||
GITHUB_TOKEN: ((github-ci-release-token))
|
||||
- put: github-release
|
||||
params:
|
||||
name: generated-release-notes/tag
|
||||
tag: generated-release-notes/tag
|
||||
body: generated-release-notes/release-notes.md
|
||||
name: generated-changelog/tag
|
||||
tag: generated-changelog/tag
|
||||
body: generated-changelog/changelog.md
|
||||
groups:
|
||||
- name: "builds"
|
||||
jobs: ["build", "jdk11-build", "jdk15-build", "windows-build"]
|
||||
|
16
ci/scripts/generate-changelog.sh
Executable file
16
ci/scripts/generate-changelog.sh
Executable file
@ -0,0 +1,16 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
version=$( cat version/version )
|
||||
|
||||
milestone=${version}
|
||||
if [[ $RELEASE_TYPE = "RELEASE" ]]; then
|
||||
milestone=${version%.RELEASE}
|
||||
fi
|
||||
|
||||
java -jar /github-changelog-generator.jar \
|
||||
--changelog.repository=spring-projects/spring-boot \
|
||||
${milestone} generated-changelog/changelog.md
|
||||
|
||||
echo ${version} > generated-changelog/version
|
||||
echo v${version} > generated-changelog/tag
|
@ -1,19 +0,0 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
version=$( cat version/version )
|
||||
|
||||
milestone=${version}
|
||||
if [[ $RELEASE_TYPE = "RELEASE" ]]; then
|
||||
milestone=${version%.RELEASE}
|
||||
fi
|
||||
|
||||
java -jar /github-release-notes-generator.jar \
|
||||
--releasenotes.github.username=${GITHUB_USERNAME} \
|
||||
--releasenotes.github.password=${GITHUB_TOKEN} \
|
||||
--releasenotes.github.organization=spring-projects \
|
||||
--releasenotes.github.repository=spring-boot \
|
||||
${milestone} generated-release-notes/release-notes.md
|
||||
|
||||
echo ${version} > generated-release-notes/version
|
||||
echo v${version} > generated-release-notes/tag
|
@ -3,13 +3,13 @@ platform: linux
|
||||
image_resource:
|
||||
type: docker-image
|
||||
source:
|
||||
repository: springio/github-release-notes-generator
|
||||
tag: '0.0.2'
|
||||
repository: springio/github-changelog-generator
|
||||
tag: '0.0.3'
|
||||
inputs:
|
||||
- name: git-repo
|
||||
- name: version
|
||||
outputs:
|
||||
- name: generated-release-notes
|
||||
- name: generated-changelog
|
||||
params:
|
||||
GITHUB_ORGANIZATION:
|
||||
GITHUB_REPO:
|
||||
@ -17,4 +17,4 @@ params:
|
||||
GITHUB_TOKEN:
|
||||
RELEASE_TYPE:
|
||||
run:
|
||||
path: git-repo/ci/scripts/generate-release-notes.sh
|
||||
path: git-repo/ci/scripts/generate-changelog.sh
|
||||
|
Loading…
Reference in New Issue
Block a user