Skip to content

Commit 2ee1329

Browse files
committed
repush
1 parent b4361d0 commit 2ee1329

File tree

1 file changed

+17
-9
lines changed

1 file changed

+17
-9
lines changed

.github/workflows/main.yml

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,16 @@ jobs:
1717
runs-on: ubuntu-latest
1818
outputs:
1919
release_upload_url: ${{ steps.create_release.outputs.upload_url }}
20+
stripped_version: ${{ steps.get_stripped_version.outputs.version }}
2021

2122
steps:
23+
- name: Get stripped version
24+
id: get_stripped_version
25+
run: |
26+
STRIPPED_VERSION=${VERSION#v}
27+
echo "Stripped version: $STRIPPED_VERSION"
28+
echo "::set-output name=version::$STRIPPED_VERSION"
29+
2230
- name: Checkout code
2331
uses: actions/checkout@v3
2432

@@ -88,7 +96,7 @@ jobs:
8896
--main-jar ${{ env.FILE_NAME }}-${{ env.VERSION }}.jar \
8997
--main-class ${{ env.MAIN_CLASS }} \
9098
--icon assets/icon/${{ env.ICON_NAME }}.icns \
91-
--app-version ${{ env.VERSION }} \
99+
--app-version ${{ needs.build.outputs.stripped_version }} \
92100
--type dmg \
93101
--dest .
94102
@@ -105,8 +113,8 @@ jobs:
105113
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
106114
with:
107115
upload_url: ${{ needs.build.outputs.release_upload_url }}
108-
asset_path: ./${{ env.FILE_NAME }}-MacOS-${{ env.VERSION }}.dmg
109-
asset_name: ${{ env.FILE_NAME }}-MacOS-${{ env.VERSION }}.dmg
116+
asset_path: ./${{ env.FILE_NAME }}-${{ needs.build.outputs.stripped_version }}.dmg
117+
asset_name: ${{ env.FILE_NAME }}-${{ needs.build.outputs.stripped_version }}-MacOS.dmg
110118
asset_content_type: application/octet-stream
111119

112120
ubuntu_build:
@@ -131,7 +139,7 @@ jobs:
131139
--main-class ${{ env.MAIN_CLASS }} \
132140
--icon assets/icon/${{ env.ICON_NAME }}.png \
133141
--resource-dir resources \
134-
--app-version ${{ env.VERSION }} \
142+
--app-version ${{ needs.build.outputs.stripped_version }} \
135143
--type deb \
136144
--dest .
137145
@@ -147,8 +155,8 @@ jobs:
147155
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
148156
with:
149157
upload_url: ${{ needs.build.outputs.release_upload_url }}
150-
asset_path: ./${{ env.FILE_NAME }}-Ubuntu-${{ env.VERSION }}_amd64.deb
151-
asset_name: ${{ env.FILE_NAME }}-Ubuntu-${{ env.VERSION }}_amd64.deb
158+
asset_path: ./${{ env.FILE_NAME }}_${{ needs.build.outputs.stripped_version }}-1_amd64.deb
159+
asset_name: ${{ env.FILE_NAME }}-${{ env.VERSION }}-linux_amd64.deb
152160
asset_content_type: application/octet-stream
153161

154162
windows_build:
@@ -179,7 +187,7 @@ jobs:
179187
--main-class ${{ env.MAIN_CLASS }} `
180188
--icon assets/icon/${{ env.ICON_NAME }}.ico `
181189
--win-shortcut `
182-
--app-version ${{ env.VERSION }} `
190+
--app-version ${{ needs.build.outputs.stripped_version }} `
183191
--type exe `
184192
--dest .
185193
@@ -195,8 +203,8 @@ jobs:
195203
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
196204
with:
197205
upload_url: ${{ needs.build.outputs.release_upload_url }}
198-
asset_path: ${{ env.OUT_DIR }}/${{ env.FILE_NAME }}-Windows-${{ env.VERSION }}.exe
199-
asset_name: ${{ env.FILE_NAME }}-Windows-${{ env.VERSION }}.exe
206+
asset_path: ${{ env.OUT_DIR }}/${{ env.FILE_NAME }}-${{ needs.build.outputs.stripped_version }}.exe
207+
asset_name: ${{ env.FILE_NAME }}-${{ needs.build.outputs.stripped_version }}-windows.exe
200208
asset_content_type: application/octet-stream
201209

202210

0 commit comments

Comments
 (0)