Skip to content

Commit 480a25d

Browse files
committed
ci: fix pyinstaller and remove _dev from platform default
1 parent ed09e1c commit 480a25d

2 files changed

Lines changed: 11 additions & 11 deletions

File tree

.github/workflows/main.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
9696
- name: Define artifact basename
9797
shell: bash
98-
run: echo "ARTIFACT_BASENAME=RCM-client_${{ env.ARTIFACT_PLATFORM }}" >> "${GITHUB_ENV}"
98+
run: echo "ARTIFACT_BASENAME=RCM-client--${{ env.ARTIFACT_PLATFORM }}" >> "${GITHUB_ENV}"
9999

100100
- name: Define artifact version for tag
101101
if: ${{ github.event_name == 'push' && contains(github.ref, 'refs/tags/') }}
@@ -209,13 +209,13 @@ jobs:
209209
with:
210210
macos: |
211211
source .venv/bin/activate
212-
pyinstaller "${RCM_CHECKOUT}/rcm/client/rcm_client_qt.spec" ${{ env.ARTIFACT_VERSION }} ${{ env.ARTIFACT_PLATFORM }}
212+
pyinstaller "${RCM_CHECKOUT}/rcm/client/rcm_client_qt.spec" -- ${{ env.ARTIFACT_VERSION }} ${{ env.ARTIFACT_PLATFORM }}
213213
linux: |
214214
source .venv/bin/activate
215-
pyinstaller "${RCM_CHECKOUT}/rcm/client/rcm_client_qt.spec" ${{ env.ARTIFACT_VERSION }} ${{ env.ARTIFACT_PLATFORM }}
215+
pyinstaller "${RCM_CHECKOUT}/rcm/client/rcm_client_qt.spec" -- ${{ env.ARTIFACT_VERSION }} ${{ env.ARTIFACT_PLATFORM }}
216216
windows: |
217217
.venv\Scripts\Activate.ps1
218-
pyinstaller "${env:RCM_CHECKOUT}\rcm\client\rcm_client_qt.spec" ${{ env.ARTIFACT_VERSION }} ${{ env.ARTIFACT_PLATFORM }}
218+
pyinstaller "${env:RCM_CHECKOUT}\rcm\client\rcm_client_qt.spec" -- ${{ env.ARTIFACT_VERSION }} ${{ env.ARTIFACT_PLATFORM }}
219219
220220
# ======================================================================
221221
# ARTIFACTS AND RELESES
@@ -234,7 +234,7 @@ jobs:
234234
uses: svenstaro/upload-release-action@v2
235235
with:
236236
file: RCM${{ env.EXT }}
237-
asset_name: ${{ env.ARTIFACT_BASENAME }}-${{ env.ARTIFACT_VERSION }}${{ env.EXT }}
237+
asset_name: ${{ env.ARTIFACT_BASENAME }}--${{ env.ARTIFACT_VERSION }}${{ env.EXT }}
238238
prerelease: true
239239
overwrite: true
240240
tag: ${{ github.ref }}
@@ -244,7 +244,7 @@ jobs:
244244
uses: svenstaro/upload-release-action@v2
245245
with:
246246
file: RCM.zip
247-
asset_name: ${{ env.ARTIFACT_BASENAME }}-${{ env.ARTIFACT_VERSION }}.zip
247+
asset_name: ${{ env.ARTIFACT_BASENAME }}--${{ env.ARTIFACT_VERSION }}.zip
248248
prerelease: true
249249
overwrite: true
250250
tag: ${{ github.ref }}
@@ -254,28 +254,28 @@ jobs:
254254
if: ${{ github.event_name != 'push' && !contains(github.ref, 'refs/tags/') }}
255255
uses: actions/upload-artifact@v4.3.1
256256
with:
257-
name: ${{ env.ARTIFACT_BASENAME }}-${{ env.ARTIFACT_VERSION }}
257+
name: ${{ env.ARTIFACT_BASENAME }}--${{ env.ARTIFACT_VERSION }}
258258
path: RCM${{ env.EXT }}
259259

260260
- name: (GHO) Upload artifact dir
261261
if: ${{ github.event_name != 'push' && !contains(github.ref, 'refs/tags/') }}
262262
uses: actions/upload-artifact@v4.3.1
263263
with:
264-
name: ${{ env.ARTIFACT_BASENAME }}-${{ env.ARTIFACT_VERSION }}-dir
264+
name: ${{ env.ARTIFACT_BASENAME }}--${{ env.ARTIFACT_VERSION }}-dir
265265
path: RCM.zip
266266

267267
# ATTESTATION
268268
- name: (Attestation) Attest RCM executable
269269
uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c # v1.4.3
270270
with:
271271
subject-path: RCM${{ env.EXT }}
272-
subject-name: ${{ env.ARTIFACT_BASENAME }}-${{ env.ARTIFACT_VERSION }}
272+
subject-name: ${{ env.ARTIFACT_BASENAME }}--${{ env.ARTIFACT_VERSION }}
273273

274274
- name: (Attestation) Attest RCM zip
275275
uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c # v1.4.3
276276
with:
277277
subject-path: RCM.zip
278-
subject-name: ${{ env.ARTIFACT_BASENAME }}-${{ env.ARTIFACT_VERSION }}-dir
278+
subject-name: ${{ env.ARTIFACT_BASENAME }}--${{ env.ARTIFACT_VERSION }}-dir
279279

280280
- name: (Attestation) Verify RCM executable and zip
281281
shell: bash

rcm/client/rcm_client_qt.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ exe_path = os.path.join('dist', exe_name)
3232

3333
build_platform_filename = os.path.join(basepath, 'build_platform.txt')
3434
with open(build_platform_filename, "w") as f:
35-
f.write(platform + '_dev' + '\n')
35+
f.write(platform + '\n')
3636
f.write(version)
3737
datas = [(os.path.join(basepath, 'rcm/client/gui/icons/*.png'), 'gui/icons/'),
3838
(os.path.join(basepath, 'rcm/client/gui/logo/logo.ico'), 'gui/logo/'),

0 commit comments

Comments
 (0)