release configuration added for desktop-app

.github/workflows/desktop-build.yml

@@ -2,6 +2,19 @@ name: "Build: Desktop"
 on:
   workflow_dispatch:
   workflow_call:
+    inputs:
+      semver:
+        required: true
+        type: string
+    secrets:
+      KEYSTORE:
+        required: true
+      KEY_ALIAS:
+        required: true
+      KEY_PASS:
+        required: true
+      KEY_STORE_PASS:
+        required: true
   push:
     branches: [ "main" ]
     paths: [ "desktopApp", "frontend" ]
@@ -32,7 +45,7 @@ jobs:
         run: |
           apt-get update
           apt-get install -y zip
-
+      
       - name: Build for macOS
         run: |
           cd desktopApp
@@ -63,21 +76,73 @@ jobs:
           cd desktopApp/release-builds/
           zip -r /desktopApp-linux.zip ./Robosats-linux-x64/*
 
-      - name: Upload macOS Build Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: desktopApp-mac.zip
-          path: desktopApp/release-builds/desktopApp-mac.zip
+      - name: 'Get Commit Hash'
+        id: commit
+        uses: pr-mpt/actions-commit-hash@v3
 
-      - name: Upload Windows Build Artifact
+      - name: 'Upload mac-build Release Artifact (for Release)'
         uses: actions/upload-artifact@v4
+        if: inputs.semver != ''  # only if this workflow is called from a push to tag (a Release)
         with:
-          name: desktopApp-win.zip
+          name: robosats-desktop-${{ inputs.semver }}-mac.zip
+          path: desktopApp/release-builds/desktopApp-mac.zip
+      
+      - name: 'Upload linux-build Release Artifact (for Release)'
+        uses: actions/upload-artifact@v4
+        if: inputs.semver != ''  # only if this workflow is called from a push to tag (a Release)
+        with:
+          name: robosats-desktop-${{ inputs.semver }}-linux.zip
+          path: desktopApp/release-builds/desktopApp-linux.zip
+      
+      - name: 'Upload win-build Release Artifact (for Release)'
+        uses: actions/upload-artifact@v4
+        if: inputs.semver != ''  # only if this workflow is called from a push to tag (a Release)
+        with:
+          name: robosats-desktop-${{ inputs.semver }}-win.zip
           path: desktopApp/release-builds/desktopApp-win.zip
 
-      - name: Upload Linux Build Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: desktopApp-linux.zip
-          path: desktopApp/release-builds/desktopApp-linux.zip
 
+      - name: Create Pre-release
+        id: create_release
+        if: inputs.semver == ''  # only if this workflow is not called from a push to tag (a Release)
+        uses: ncipollo/release-action@v1.13.0
+        with:
+          tag: desktop-${{ steps.commit.outputs.short }}
+          name: robosats-desktop-${{ steps.commit.outputs.short }}
+          prerelease: true
+
+      - name: Upload macOS Build Artifact
+        id: upload-release-mac-zip-asset
+        if: inputs.semver == ''  # only if this workflow is not called from a push to tag (a Release)
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: /desktopApp-mac.zip
+          asset_name: robosats-desktop-${{ steps.commit.outputs.short }}-mac.zip
+          asset_content_type: application/zip
+
+      - name: Upload Windows Build Artifact
+        id: upload-release-win-zip-asset
+        if: inputs.semver == ''  # only if this workflow is not called from a push to tag (a Release)
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: /desktopApp-win.zip
+          asset_name: robosats-desktop-${{ steps.commit.outputs.short }}-win.zip
+          asset_content_type: application/zip
+
+      - name: Upload Linux Build Artifact
+        id: upload-release-linux-zip-asset
+        if: inputs.semver == ''  # only if this workflow is not called from a push to tag (a Release)
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: /desktopApp-linux.zip
+          asset_name: robosats-desktop-${{ steps.commit.outputs.short }}-linux.zip
+          asset_content_type: application/zip

.github/workflows/release.yml

@@ -74,9 +74,16 @@ jobs:
     secrets: inherit
     with:
       semver: ${{ needs.check-versions.outputs.semver }}
+  
+  desktop-build:
+    uses: RoboSats/robosats/.github/workflows/desktop-build.yml@main
+    needs: [frontend-build, check-versions]
+    secrets: inherit
+    with:
+      semver: ${{ needs.check-versions.outputs.semver }}
 
   release:
-    needs: [check-versions, integration-tests, coordinator-image, selfhosted-client-image, web-client-image, android-build]
+    needs: [check-versions, integration-tests, coordinator-image, selfhosted-client-image, web-client-image, android-build, desktop-build]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -171,4 +178,20 @@ jobs:
           upload_url: ${{ steps.create-release.outputs.upload_url }}
           asset_path: app-x86-release.apk
           asset_name: robosats-${{ needs.check-versions.outputs.semver }}-x86.apk
-          asset_content_type: application/apk
+          asset_content_type: application/apk
+      
+      - name: 'Download macOS Build Artifact'
+        uses: actions/download-artifact@v4
+        with:
+          name: robosats-desktop-${{ needs.check-versions.outputs.semver }}-mac.zip
+          path: .
+      - name: 'Upload macOS Build Artifact'
+        id: upload-release-mac-zip-asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create-release.outputs.upload_url }}
+          asset_path: desktopApp-mac.zip
+          asset_name: robosats-desktop-${{ needs.check-versions.outputs.semver }}-mac.zip
+          asset_content_type: application/zip

desktopApp/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "Robosats",
+  "name": "robosats-desktop-app",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",