Skip to content

Commit bb21b6c

Browse files
msanllimsanlli
committed
fix release structure in release.yaml
1 parent 1746489 commit bb21b6c

1 file changed

Lines changed: 38 additions & 36 deletions

File tree

‎.github/workflows/release.yaml‎

Lines changed: 38 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -299,12 +299,6 @@ jobs:
299299
mkdir -p release-windows
300300
mkdir -p release-macos
301301
mkdir -p release-macos-arm64
302-
303-
# Setup frontend directories for each platform
304-
for platform in release-linux release-windows release-macos release-macos-arm64; do
305-
mkdir -p $platform/frontends/ethernet-view
306-
mkdir -p $platform/frontends/control-station
307-
done
308302
309303
- name: Organize Linux release files
310304
run: |
@@ -317,15 +311,17 @@ jobs:
317311
cp artifacts/updater-linux/updater-linux-amd64 release-linux/updater
318312
319313
# Copy frontends
320-
cp -r artifacts/ethernet-view/* release-linux/frontends/ethernet-view/
321-
cp -r artifacts/control-station/* release-linux/frontends/control-station/
314+
mkdir -p release-linux/ethernet-view
315+
mkdir -p release-linux/control-station
316+
cp -r artifacts/ethernet-view/* release-linux/ethernet-view/
317+
cp -r artifacts/control-station/* release-linux/control-station/
322318
323319
# Copy common files
324320
cp -r artifacts/common-files/* release-linux/
325321
326322
# Create Linux release archive
327323
cd release-linux
328-
zip -r ../software-release-linux-$VERSION.zip .
324+
zip -r ../linux-$VERSION.zip .
329325
330326
- name: Organize Windows release files
331327
run: |
@@ -338,15 +334,17 @@ jobs:
338334
cp artifacts/updater-windows/updater-windows-amd64.exe release-windows/updater.exe
339335
340336
# Copy frontends
341-
cp -r artifacts/ethernet-view/* release-windows/frontends/ethernet-view/
342-
cp -r artifacts/control-station/* release-windows/frontends/control-station/
337+
mkdir -p release-windows/ethernet-view
338+
mkdir -p release-windows/control-station
339+
cp -r artifacts/ethernet-view/* release-windows/ethernet-view/
340+
cp -r artifacts/control-station/* release-windows/control-station/
343341
344342
# Copy common files
345343
cp -r artifacts/common-files/* release-windows/
346344
347345
# Create Windows release archive
348346
cd release-windows
349-
zip -r ../software-release-windows-$VERSION.zip .
347+
zip -r ../windows-$VERSION.zip .
350348
351349
- name: Organize macOS Intel release files
352350
run: |
@@ -359,15 +357,17 @@ jobs:
359357
cp artifacts/updater-macos/updater-macos-amd64 release-macos/updater
360358
361359
# Copy frontends
362-
cp -r artifacts/ethernet-view/* release-macos/frontends/ethernet-view/
363-
cp -r artifacts/control-station/* release-macos/frontends/control-station/
360+
mkdir -p release-macos/ethernet-view
361+
mkdir -p release-macos/control-station
362+
cp -r artifacts/ethernet-view/* release-macos/ethernet-view/
363+
cp -r artifacts/control-station/* release-macos/control-station/
364364
365365
# Copy common files
366366
cp -r artifacts/common-files/* release-macos/
367367
368368
# Create macOS Intel release archive
369369
cd release-macos
370-
zip -r ../software-release-macos-intel-$VERSION.zip .
370+
zip -r ../macos-intel-$VERSION.zip .
371371
372372
- name: Organize macOS ARM64 release files
373373
run: |
@@ -380,21 +380,23 @@ jobs:
380380
cp artifacts/updater-macos/updater-macos-arm64 release-macos-arm64/updater
381381
382382
# Copy frontends
383-
cp -r artifacts/ethernet-view/* release-macos-arm64/frontends/ethernet-view/
384-
cp -r artifacts/control-station/* release-macos-arm64/frontends/control-station/
383+
mkdir -p release-macos-arm64/ethernet-view
384+
mkdir -p release-macos-arm64/control-station
385+
cp -r artifacts/ethernet-view/* release-macos-arm64/ethernet-view/
386+
cp -r artifacts/control-station/* release-macos-arm64/control-station/
385387
386388
# Copy common files
387389
cp -r artifacts/common-files/* release-macos-arm64/
388390
389391
# Create macOS ARM64 release archive
390392
cd release-macos-arm64
391-
zip -r ../software-release-macos-arm64-$VERSION.zip .
393+
zip -r ../macos-arm64-$VERSION.zip .
392394
393395
- name: Upload release packages
394396
uses: actions/upload-artifact@v4
395397
with:
396-
name: software-releases
397-
path: software-release-*.zip
398+
name: releases
399+
path: "*.zip"
398400
retention-days: 7
399401
compression-level: 9
400402

@@ -417,8 +419,8 @@ jobs:
417419
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
418420
with:
419421
upload_url: ${{ steps.create_release.outputs.upload_url }}
420-
asset_path: ./software-release-linux-${{ github.event.inputs.version }}.zip
421-
asset_name: software-release-linux-${{ github.event.inputs.version }}.zip
422+
asset_path: ./linux-${{ github.event.inputs.version }}.zip
423+
asset_name: linux-${{ github.event.inputs.version }}.zip
422424
asset_content_type: application/zip
423425

424426
- name: Upload Windows package to release
@@ -428,8 +430,8 @@ jobs:
428430
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
429431
with:
430432
upload_url: ${{ steps.create_release.outputs.upload_url }}
431-
asset_path: ./software-release-windows-${{ github.event.inputs.version }}.zip
432-
asset_name: software-release-windows-${{ github.event.inputs.version }}.zip
433+
asset_path: ./windows-${{ github.event.inputs.version }}.zip
434+
asset_name: windows-${{ github.event.inputs.version }}.zip
433435
asset_content_type: application/zip
434436

435437
- name: Upload macOS Intel package to release
@@ -439,8 +441,8 @@ jobs:
439441
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
440442
with:
441443
upload_url: ${{ steps.create_release.outputs.upload_url }}
442-
asset_path: ./software-release-macos-intel-${{ github.event.inputs.version }}.zip
443-
asset_name: software-release-macos-intel-${{ github.event.inputs.version }}.zip
444+
asset_path: ./macos-intel-${{ github.event.inputs.version }}.zip
445+
asset_name: macos-intel-${{ github.event.inputs.version }}.zip
444446
asset_content_type: application/zip
445447

446448
- name: Upload macOS ARM64 package to release
@@ -450,8 +452,8 @@ jobs:
450452
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
451453
with:
452454
upload_url: ${{ steps.create_release.outputs.upload_url }}
453-
asset_path: ./software-release-macos-arm64-${{ github.event.inputs.version }}.zip
454-
asset_name: software-release-macos-arm64-${{ github.event.inputs.version }}.zip
455+
asset_path: ./macos-arm64-${{ github.event.inputs.version }}.zip
456+
asset_name: macos-arm64-${{ github.event.inputs.version }}.zip
455457
asset_content_type: application/zip
456458

457459
- name: Upload Linux package to existing release
@@ -461,8 +463,8 @@ jobs:
461463
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
462464
with:
463465
upload_url: ${{ github.event.release.upload_url }}
464-
asset_path: ./software-release-linux-${{ github.event.release.tag_name }}.zip
465-
asset_name: software-release-linux-${{ github.event.release.tag_name }}.zip
466+
asset_path: ./linux-${{ github.event.release.tag_name }}.zip
467+
asset_name: linux-${{ github.event.release.tag_name }}.zip
466468
asset_content_type: application/zip
467469

468470
- name: Upload Windows package to existing release
@@ -472,8 +474,8 @@ jobs:
472474
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
473475
with:
474476
upload_url: ${{ github.event.release.upload_url }}
475-
asset_path: ./software-release-windows-${{ github.event.release.tag_name }}.zip
476-
asset_name: software-release-windows-${{ github.event.release.tag_name }}.zip
477+
asset_path: ./windows-${{ github.event.release.tag_name }}.zip
478+
asset_name: windows-${{ github.event.release.tag_name }}.zip
477479
asset_content_type: application/zip
478480

479481
- name: Upload macOS Intel package to existing release
@@ -483,8 +485,8 @@ jobs:
483485
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
484486
with:
485487
upload_url: ${{ github.event.release.upload_url }}
486-
asset_path: ./software-release-macos-intel-${{ github.event.release.tag_name }}.zip
487-
asset_name: software-release-macos-intel-${{ github.event.release.tag_name }}.zip
488+
asset_path: ./macos-intel-${{ github.event.release.tag_name }}.zip
489+
asset_name: macos-intel-${{ github.event.release.tag_name }}.zip
488490
asset_content_type: application/zip
489491

490492
- name: Upload macOS ARM64 package to existing release
@@ -494,6 +496,6 @@ jobs:
494496
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
495497
with:
496498
upload_url: ${{ github.event.release.upload_url }}
497-
asset_path: ./software-release-macos-arm64-${{ github.event.release.tag_name }}.zip
498-
asset_name: software-release-macos-arm64-${{ github.event.release.tag_name }}.zip
499+
asset_path: ./macos-arm64-${{ github.event.release.tag_name }}.zip
500+
asset_name: macos-arm64-${{ github.event.release.tag_name }}.zip
499501
asset_content_type: application/zip

0 commit comments

Comments
 (0)