Merge pull request #10 from encryptedge/feat/desktop-client

feat/desktop client

.github/actions/setup/action.yml

@@ -13,10 +13,6 @@ runs:
               node-version: 18
               registry-url: https://registry.npmjs.org/
 
-        - name: Install dependencies
-          shell: bash
-          run: pnpm i
-
         - name: Restore Turborepo Cache
           uses: actions/cache@v3
           with:

.github/workflows/build-client.yaml

@@ -3,11 +3,31 @@ name: Build and Release Desktop Client
 on:
   workflow_dispatch:
     inputs:
-      serverip:
-        default: '0.0.0.0:4000'
+      server_url:
+        default: 'http://127.0.0.1:4000'
         required: false
         type: string
-        description: 'Server IP for RCS CTF API Server'
+        description: 'Server URL (with port) for RCS CTF API Server'
+      release_version:
+        default: '0.0.0-dev'
+        required: false
+        type: string
+        description: 'Release version for the client'
+      release_name:
+        default: 'local-development'
+        required: false
+        type: string
+        description: 'Release name for the client'
+      is_pre_release:
+        default: true
+        required: false
+        type: boolean
+        description: 'Is this a pre-release?'
+      draft_release:
+        default: true
+        required: false
+        type: boolean
+        description: 'Do you want to draft?'
 
 permissions:
   issues: write
@@ -23,7 +43,7 @@ jobs:
       matrix:
         platform: [macos-latest, ubuntu-20.04, windows-latest]
 
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.platform }}
 
     steps:
       - name: Check out code
@@ -33,11 +53,14 @@ jobs:
 
       - name: Setup Environment
         uses: ./.github/actions/setup
-
+      
       - name: Copy before build
         run: |
-          cd packages/deployer-url
-          node entrypoint.js ${{ github.event.inputs.serverip }}
+          bash bootstrap.sh ${{ github.event.inputs.server_url }}
+
+      - name: Install dependencies
+        shell: bash
+        run: pnpm i
 
       - name: Build
         run: pnpm build:client
@@ -59,10 +82,10 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tagName: app-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version
-          releaseName: 'App v__VERSION__'
+          tagName: ${{ github.event.inputs.release_name }}-v${{ github.event.inputs.release_version }} # the action automatically replaces \_\_VERSION\_\_ with the app version
+          releaseName: '${{ github.event.inputs.release_name }} v${{ github.event.inputs.release_version }}'
           releaseBody: 'See the assets to download this version and install.'
-          releaseDraft: true
-          prerelease: false
+          releaseDraft: ${{ github.event.inputs.draft_release }}
+          prerelease: ${{ github.event.inputs.is_pre_release }}
           projectPath: apps/desktop/src-tauri
-          distPath: apps/desktop/src
+          distPath: apps/desktop/dist

.github/workflows/build.yaml

@@ -24,5 +24,13 @@ jobs:
       - name: Setup Environment
         uses: ./.github/actions/setup
 
+      - name: Run before install
+        run: |
+          bash bootstrap.sh http://127.0.0.1:4000
+
+      - name: Install dependencies
+        shell: bash
+        run: pnpm i
+
       - name: Install Dependencies
         run: pnpm build

.gitignore

@@ -39,4 +39,5 @@ yarn-error.log*
 
 # Keys
 packages/api/keys/jwtRS256.key
-packages/api/keys/jwtRS256.key.pub
+packages/api/keys/jwtRS256.key.pub
+/target

.vscode/settings.json

@@ -3,5 +3,8 @@
     {
       "mode": "auto"
     }
+  ],
+  "rust-analyzer.linkedProjects": [
+    "./apps/desktop/src-tauri/Cargo.toml",
   ]
 }