Skip to content

Commit 52dd046

Browse files
committed
Propagate tag on release action.
1 parent be5ca86 commit 52dd046

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

.github/workflows/release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ jobs:
1818
uses: einaregilsson/build-number@v3
1919
with:
2020
token: ${{secrets.GITHUB_TOKEN}}
21+
- name: Set github tag
22+
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
2123
- name: Build artifacts
22-
run: ./gradlew -Penv=production -PbuildNumber=${{ steps.buildnumber.outputs.build_number }} clean assemble
24+
run: ./gradlew -Penv=production -Prelease= ${{ env.RELEASE_VERSION }} -PbuildNumber=${{ steps.buildnumber.outputs.build_number }} clean assemble
2325
- uses: ncipollo/release-action@v1
2426
with:
2527
artifacts: "build/distributions/sdkman-cli-*.zip"

build.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,18 @@ def loadConfiguration() {
2020
ext.buildNumber = buildNumber
2121
println("Build number set to: ${buildNumber}")
2222

23+
def release = hasProperty('release') ? release : 'master'
24+
ext.release = release
25+
println("Release set to: ${release}")
26+
2327
def configFile = file('config.groovy')
2428
def config = new ConfigSlurper(environment).parse(configFile.toURI().toURL())
2529
ext.config = config
2630
}
2731

2832
loadConfiguration()
2933

30-
ext.sdkmanCliBuildVersion = "${config.sdkmanCliVersion}+${buildNumber}".toString()
34+
ext.sdkmanCliBuildVersion = "${release}+${buildNumber}".toString()
3135

3236
repositories.jcenter()
3337

0 commit comments

Comments
 (0)