Merge branch 'develop' into backend/updater

Author: JESUSJH18

.github/workflows/release.yaml

@@ -285,57 +285,118 @@ jobs:
     needs: [build-backend, build-frontend, build-updater, prepare-common-files]
     runs-on: ubuntu-latest
     steps:
-      - name: Create release directories
-        run: |
-          mkdir -p release
-          mkdir -p release/backends
-          mkdir -p release/updaters
-          mkdir -p release/frontends/ethernet-view
-          mkdir -p release/frontends/control-station
-      
       - name: Download all artifacts
         uses: actions/download-artifact@v4
         with:
           path: artifacts
 
-      - name: Organize release files
+      - name: Create release directories for each platform
         run: |
-          # Copy backends
-          cp -r artifacts/backend-linux/* release/backends/
-          cp -r artifacts/backend-windows/* release/backends/
-          cp -r artifacts/backend-macos/* release/backends/
+          VERSION="${{ github.event.inputs.version || github.event.release.tag_name || 'latest' }}"
           
-          # Copy updaters to appropriate folders by platform
-          mkdir -p release/linux release/windows release/macos release/macos-arm64
+          # Create directory structure for each platform
+          mkdir -p release-linux
+          mkdir -p release-windows
+          mkdir -p release-macos
+          mkdir -p release-macos-arm64
+      
+      - name: Organize Linux release files
+        run: |
+          VERSION="${{ github.event.inputs.version || github.event.release.tag_name || 'latest' }}"
+          
+          # Copy Linux backend
+          cp artifacts/backend-linux/backend-linux-amd64 release-linux/backend
           
           # Copy Linux updater
-          cp artifacts/updater-linux/updater-linux-amd64 release/linux/updater
+          cp artifacts/updater-linux/updater-linux-amd64 release-linux/updater
+          
+          # Copy frontends
+          mkdir -p release-linux/ethernet-view
+          mkdir -p release-linux/control-station
+          cp -r artifacts/ethernet-view/* release-linux/ethernet-view/
+          cp -r artifacts/control-station/* release-linux/control-station/
+          
+          # Copy common files
+          cp -r artifacts/common-files/* release-linux/
+          
+          # Create Linux release archive
+          cd release-linux
+          zip -r ../linux-$VERSION.zip .
+      
+      - name: Organize Windows release files
+        run: |
+          VERSION="${{ github.event.inputs.version || github.event.release.tag_name || 'latest' }}"
+          
+          # Copy Windows backend
+          cp artifacts/backend-windows/backend-windows-amd64.exe release-windows/backend.exe
           
           # Copy Windows updater
-          cp artifacts/updater-windows/updater-windows-amd64.exe release/windows/updater.exe
+          cp artifacts/updater-windows/updater-windows-amd64.exe release-windows/updater.exe
           
-          # Copy macOS updaters
-          cp artifacts/updater-macos/updater-macos-amd64 release/macos/updater
-          cp artifacts/updater-macos/updater-macos-arm64 release/macos-arm64/updater
+          # Copy frontends
+          mkdir -p release-windows/ethernet-view
+          mkdir -p release-windows/control-station
+          cp -r artifacts/ethernet-view/* release-windows/ethernet-view/
+          cp -r artifacts/control-station/* release-windows/control-station/
+          
+          # Copy common files
+          cp -r artifacts/common-files/* release-windows/
+          
+          # Create Windows release archive
+          cd release-windows
+          zip -r ../windows-$VERSION.zip .
+      
+      - name: Organize macOS Intel release files
+        run: |
+          VERSION="${{ github.event.inputs.version || github.event.release.tag_name || 'latest' }}"
+          
+          # Copy macOS Intel backend
+          cp artifacts/backend-macos/backend-macos-amd64 release-macos/backend
+          
+          # Copy macOS Intel updater
+          cp artifacts/updater-macos/updater-macos-amd64 release-macos/updater
           
           # Copy frontends
-          cp -r artifacts/ethernet-view/* release/frontends/ethernet-view/
-          cp -r artifacts/control-station/* release/frontends/control-station/
+          mkdir -p release-macos/ethernet-view
+          mkdir -p release-macos/control-station
+          cp -r artifacts/ethernet-view/* release-macos/ethernet-view/
+          cp -r artifacts/control-station/* release-macos/control-station/
           
           # Copy common files
-          cp -r artifacts/common-files/* release/
+          cp -r artifacts/common-files/* release-macos/
+          
+          # Create macOS Intel release archive
+          cd release-macos
+          zip -r ../macos-intel-$VERSION.zip .
       
-      - name: Create release archive
+      - name: Organize macOS ARM64 release files
         run: |
           VERSION="${{ github.event.inputs.version || github.event.release.tag_name || 'latest' }}"
-          cd release
-          zip -r ../software-release-$VERSION.zip .
+          
+          # Copy macOS ARM64 backend
+          cp artifacts/backend-macos/backend-macos-arm64 release-macos-arm64/backend
+          
+          # Copy macOS ARM64 updater
+          cp artifacts/updater-macos/updater-macos-arm64 release-macos-arm64/updater
+          
+          # Copy frontends
+          mkdir -p release-macos-arm64/ethernet-view
+          mkdir -p release-macos-arm64/control-station
+          cp -r artifacts/ethernet-view/* release-macos-arm64/ethernet-view/
+          cp -r artifacts/control-station/* release-macos-arm64/control-station/
+          
+          # Copy common files
+          cp -r artifacts/common-files/* release-macos-arm64/
+          
+          # Create macOS ARM64 release archive
+          cd release-macos-arm64
+          zip -r ../macos-arm64-$VERSION.zip .
       
-      - name: Upload release package
+      - name: Upload release packages
         uses: actions/upload-artifact@v4
         with:
-          name: software-release
-          path: software-release-*.zip
+          name: releases
+          path: "*.zip"
           retention-days: 7
           compression-level: 9
 
@@ -351,24 +412,90 @@ jobs:
           draft: ${{ github.event.inputs.draft }}
           prerelease: false
 
-      - name: Upload to workflow dispatch release
+      - name: Upload Linux package to release
+        if: github.event_name == 'workflow_dispatch'
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./linux-${{ github.event.inputs.version }}.zip
+          asset_name: linux-${{ github.event.inputs.version }}.zip
+          asset_content_type: application/zip
+          
+      - name: Upload Windows package to release
         if: github.event_name == 'workflow_dispatch'
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./software-release-${{ github.event.inputs.version }}.zip
-          asset_name: software-release-${{ github.event.inputs.version }}.zip
+          asset_path: ./windows-${{ github.event.inputs.version }}.zip
+          asset_name: windows-${{ github.event.inputs.version }}.zip
+          asset_content_type: application/zip
+          
+      - name: Upload macOS Intel package to release
+        if: github.event_name == 'workflow_dispatch'
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./macos-intel-${{ github.event.inputs.version }}.zip
+          asset_name: macos-intel-${{ github.event.inputs.version }}.zip
+          asset_content_type: application/zip
+          
+      - name: Upload macOS ARM64 package to release
+        if: github.event_name == 'workflow_dispatch'
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./macos-arm64-${{ github.event.inputs.version }}.zip
+          asset_name: macos-arm64-${{ github.event.inputs.version }}.zip
+          asset_content_type: application/zip
+          
+      - name: Upload Linux package to existing release
+        if: github.event_name == 'release'
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: ./linux-${{ github.event.release.tag_name }}.zip
+          asset_name: linux-${{ github.event.release.tag_name }}.zip
+          asset_content_type: application/zip
+          
+      - name: Upload Windows package to existing release
+        if: github.event_name == 'release'
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: ./windows-${{ github.event.release.tag_name }}.zip
+          asset_name: windows-${{ github.event.release.tag_name }}.zip
+          asset_content_type: application/zip
+          
+      - name: Upload macOS Intel package to existing release
+        if: github.event_name == 'release'
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: ./macos-intel-${{ github.event.release.tag_name }}.zip
+          asset_name: macos-intel-${{ github.event.release.tag_name }}.zip
           asset_content_type: application/zip
 
-      - name: Upload to existing release
+      - name: Upload macOS ARM64 package to existing release
         if: github.event_name == 'release'
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ./software-release-${{ github.event.release.tag_name }}.zip
-          asset_name: software-release-${{ github.event.release.tag_name }}.zip
+          asset_path: ./macos-arm64-${{ github.event.release.tag_name }}.zip
+          asset_name: macos-arm64-${{ github.event.release.tag_name }}.zip
           asset_content_type: application/zip