Skip to content

Commit 9858b4b

Browse files
committed
Fix release script
1 parent 83a3212 commit 9858b4b

File tree

4 files changed

+32
-5
lines changed

4 files changed

+32
-5
lines changed

.github/actions/create-github-release/action.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,16 @@ inputs:
77
token:
88
description: 'Token to use for authentication with GitHub'
99
required: true
10+
commercial:
11+
description: 'Whether to generate the changelog for the commercial release'
12+
required: true
1013
runs:
1114
using: composite
1215
steps:
1316
- name: Generate Changelog
1417
uses: spring-io/github-changelog-generator@185319ad7eaa75b0e8e72e4b6db19c8b2cb8c4c1 #v0.0.11
1518
with:
16-
config-file: .github/actions/create-github-release/changelog-generator.yml
19+
config-file: ${{ inputs.commercial && '.github/actions/create-github-release/changelog-generator-commercial.yml' || '.github/actions/create-github-release/changelog-generator-oss.yml' }}
1720
milestone: ${{ inputs.milestone }}
1821
token: ${{ inputs.token }}
1922
- name: Create GitHub Release

.github/actions/create-github-release/changelog-generator.yml renamed to .github/actions/create-github-release/changelog-generator-commercial.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ changelog:
1515
labels:
1616
- "type: dependency-upgrade"
1717
issues:
18-
generate_links: ${{ !vars.COMMERCIAL }}
18+
generate_links: false
1919
ports:
2020
- label: "status: forward-port"
2121
bodyExpression: 'Forward port of issue #(\d+).*'
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
changelog:
2+
sections:
3+
- title: ":star: New Features"
4+
labels:
5+
- "type: enhancement"
6+
- title: ":lady_beetle: Bug Fixes"
7+
labels:
8+
- "type: bug"
9+
- "type: regression"
10+
- title: ":notebook_with_decorative_cover: Documentation"
11+
labels:
12+
- "type: documentation"
13+
- title: ":hammer: Dependency Upgrades"
14+
sort: "title"
15+
labels:
16+
- "type: dependency-upgrade"
17+
issues:
18+
generate_links: true
19+
ports:
20+
- label: "status: forward-port"
21+
bodyExpression: 'Forward port of issue #(\d+).*'
22+
- label: "status: back-port"
23+
bodyExpression: 'Back port of issue #(\d+).*'

.github/workflows/release.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
version: ${{ needs.build-and-stage-release.outputs.version }}
5757
sync-to-maven-central:
5858
name: Sync to Maven Central
59-
if: ${{ !COMMERCIAL }}
59+
if: ${{ !vars.COMMERCIAL }}
6060
needs:
6161
- build-and-stage-release
6262
- verify
@@ -91,7 +91,7 @@ jobs:
9191
run: jfrog rt build-promote ${{ format('spring-boot-commercial-{0}', needs.build-and-stage-release.outputs.version)}} ${{ github.run_number }} spring-enterprise-maven-prod-local --project spring
9292
publish-gradle-plugin:
9393
name: Publish Gradle Plugin
94-
if: ${{ !COMMERCIAL }}
94+
if: ${{ !vars.COMMERCIAL }}
9595
needs:
9696
- build-and-stage-release
9797
- sync-to-maven-central
@@ -108,7 +108,7 @@ jobs:
108108
plugin-version: ${{ needs.build-and-stage-release.outputs.version }}
109109
publish-to-sdkman:
110110
name: Publish to SDKMAN!
111-
if: ${{ !COMMERCIAL }}
111+
if: ${{ !vars.COMMERCIAL }}
112112
needs:
113113
- build-and-stage-release
114114
- sync-to-maven-central
@@ -139,3 +139,4 @@ jobs:
139139
with:
140140
milestone: ${{ needs.build-and-stage-release.outputs.version }}
141141
token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
142+
commercial: ${{ vars.COMMERCIAL }}

0 commit comments

Comments
 (0)