Skip to content

Commit f3e893a

Browse files
authored
Merge pull request #72 from sourceplusplus/release-flow
Update build.yml
2 parents 7c41782 + cc851b6 commit f3e893a

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

.github/workflows/build.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ jobs:
3838
echo "::set-output name=version::$VERSION"
3939
echo "SPP_CLI_VERSION=$VERSION" >> $GITHUB_ENV
4040
echo "SPP_RELEASE_VERSION=${VERSION/-SNAPSHOT/}" >> $GITHUB_ENV
41+
SPP_RELEASE_VERSION=${VERSION/-SNAPSHOT/}
42+
echo "::set-output name=release_version::$SPP_RELEASE_VERSION"
4143
4244
- name: Build native spp-cli (Release)
4345
if: github.ref == 'refs/heads/master'
@@ -89,6 +91,8 @@ jobs:
8991
echo "::set-output name=version::$VERSION"
9092
echo "SPP_CLI_VERSION=$VERSION" >> $GITHUB_ENV
9193
echo "SPP_RELEASE_VERSION=${VERSION/-SNAPSHOT/}" >> $GITHUB_ENV
94+
SPP_RELEASE_VERSION=${VERSION/-SNAPSHOT/}
95+
echo "::set-output name=release_version::$SPP_RELEASE_VERSION"
9296
9397
- name: Build native spp-cli.exe (Release)
9498
if: github.ref == 'refs/heads/master'
@@ -129,6 +133,7 @@ jobs:
129133

130134
outputs:
131135
version: ${{ steps.properties.outputs.version }}
136+
release_version: ${{ steps.properties.outputs.release_version }}
132137
steps:
133138
- uses: actions/checkout@v2
134139
- uses: ayltai/setup-graalvm@v1
@@ -146,6 +151,8 @@ jobs:
146151
echo "::set-output name=version::$VERSION"
147152
echo "SPP_CLI_VERSION=$VERSION" >> $GITHUB_ENV
148153
echo "SPP_RELEASE_VERSION=${VERSION/-SNAPSHOT/}" >> $GITHUB_ENV
154+
SPP_RELEASE_VERSION=${VERSION/-SNAPSHOT/}
155+
echo "::set-output name=release_version::$SPP_RELEASE_VERSION"
149156
150157
- name: Build native spp-cli (Release)
151158
if: github.ref == 'refs/heads/master'
@@ -257,8 +264,8 @@ jobs:
257264
env:
258265
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
259266
with:
260-
tag_name: ${{ needs.buildOnLinux.outputs.version }}
261-
release_name: v${{ needs.buildOnLinux.outputs.version }}
267+
tag_name: ${{ needs.buildOnLinux.outputs.release_version }}
268+
release_name: v${{ needs.buildOnLinux.outputs.release_version }}
262269
body: ${{ needs.build.outputs.changelog }}
263270
draft: true
264271

@@ -274,7 +281,7 @@ jobs:
274281
with:
275282
upload_url: ${{ steps.createDraft.outputs.upload_url }}
276283
asset_path: ./spp-cli-macOS.zip
277-
asset_name: spp-cli-${{ needs.buildOnLinux.outputs.version }}-macOS.zip
284+
asset_name: spp-cli-${{ needs.buildOnLinux.outputs.release_version }}-macOS.zip
278285
asset_content_type: application/zip
279286

280287
- name: Download spp-cli-win64 artifact
@@ -289,7 +296,7 @@ jobs:
289296
with:
290297
upload_url: ${{ steps.createDraft.outputs.upload_url }}
291298
asset_path: ./spp-cli-win64.zip
292-
asset_name: spp-cli-${{ needs.buildOnLinux.outputs.version }}-win64.zip
299+
asset_name: spp-cli-${{ needs.buildOnLinux.outputs.release_version }}-win64.zip
293300
asset_content_type: application/zip
294301

295302
- name: Download spp-cli-linux64 artifact
@@ -304,5 +311,5 @@ jobs:
304311
with:
305312
upload_url: ${{ steps.createDraft.outputs.upload_url }}
306313
asset_path: ./spp-cli-linux64.zip
307-
asset_name: spp-cli-${{ needs.buildOnLinux.outputs.version }}-linux64.zip
314+
asset_name: spp-cli-${{ needs.buildOnLinux.outputs.release_version }}-linux64.zip
308315
asset_content_type: application/zip

0 commit comments

Comments
 (0)