Merge branch 'main' into dev

Reviewed-on: #20

.gitea/workflows/darwin.yaml

@@ -51,24 +51,25 @@ jobs:
       - name: NPM offline setup
         shell: bash
         run: |
+          mkdir -p dist/builds/darwin/arm64 dist/builds/darwin/x64 
           npm config set cache "$HOME/.npm-cache" --global
           npm config set prefer-offline true --global
 
       - name: Install npm dependencies
         run: npm install --prefer-offline --no-audit --no-fund
 
-      - name: Build the application (${{ matrix.arch }})
+      - name: Build the application
         run: |
           npx electron-vite build
           npx electron-builder --mac --${{ matrix.arch }}
 
-      - name: Check if files exist (${{ matrix.arch }})
+      - name: Check if files exist
         run: |
           echo "=== Checking dist structure ==="
           find dist/builds/darwin/${{ matrix.arch }} -type f -name "*.pkg" 2>/dev/null || echo "No PKG files found"
           ls -la dist/builds/darwin/${{ matrix.arch }}/ 2>/dev/null || echo "arch folder not found"
 
-      - name: Upload ${{ matrix.arch }} to SSH using SCP
+      - name: Upload to SSH using SCP
         uses: appleboy/scp-action@master
         with:
           host: ${{ secrets.SDU_SSH_HOST }}

.gitea/workflows/linux.yaml

@@ -1,7 +1,6 @@
 name: Linux Kernel Build
 run-name: Build and Upload Linux Kernel
 
-#Запускаем только кнопкой "Run workflow" в Actions
 on:
   workflow_dispatch:
   push:
@@ -16,9 +15,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch: [x64, arm64]
+        include:
-    env:
+          - arch: x64
-      ARCH: ${{ matrix.arch }}
+            out_dir: x86_64
+          - arch: arm64
+            out_dir: arm64
 
     steps:
       - name: Checkout code
@@ -29,59 +30,34 @@ jobs:
         with:
           node-version: '22'
 
-      - name: Cache npm dependencies
-        uses: actions/cache@v5
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-linux-npm-${{ hashFiles('**/package.json') }}
-          restore-keys: |
-            ${{ runner.os }}-linux-npm-
-          if-no-files-found: ignore
-
-      - name: Cache electron-builder
-        uses: actions/cache@v5
-        with:
-          path: |
-            ~/.cache/electron
-          key: ${{ runner.os }}-linux-electron-builder-${{ hashFiles('**/electron-builder.yml') }}
-          restore-keys: |
-            ${{ runner.os }}-linux-electron-builder-
-          if-no-files-found: ignore
-
-      - name: NPM offline setup
-        run: |
-          npm config set cache ~/.npm --global
-          npm config set prefer-offline true --global
-
       - name: Install npm dependencies
         run: npm install --no-audit --no-fund
 
       - name: Debug ARCH
         run: |
-          echo "matrix.arch = ${{ matrix.arch }}"
+          echo "arch=${{ matrix.arch }}"
-          echo "ARCH = $ARCH"
+          echo "out_dir=${{ matrix.out_dir }}"
 
-      - name: Build the application (${{ env.ARCH }})
+      - name: Build the application
         run: |
-          mkdir -p dist/builds/linux/$ARCH
+          mkdir -p dist/builds/linux/${{ matrix.out_dir }}
-          mkdir -p dist/builds/linux/x86_64
           npx electron-vite build
           npx electron-builder --linux --$ARCH
 
-      - name: Check if files exist (${{ env.ARCH }})
+      - name: Check if files exist
         run: |
           echo "=== Checking dist structure ==="
-          find dist/builds/linux/$ARCH -type f -name "*.AppImage" 2>/dev/null || echo "No AppImage files found"
+          find dist/builds/linux/${{ matrix.out_dir }} -type f -name "*.AppImage" 2>/dev/null || echo "No AppImage files found"
-          ls -la dist/builds/linux/$ARCH/ 2>/dev/null || echo "arch folder not found"
+          ls -la dist/builds/linux/${{ matrix.out_dir }}/ 2>/dev/null || echo "arch folder not found"
 
-      - name: Upload ${{ env.ARCH }} to SSH using SCP
+      - name: Upload to SSH using SCP
         uses: appleboy/scp-action@master
         with:
           host: ${{ secrets.SDU_SSH_HOST }}
           username: ${{ secrets.SDU_SSH_USERNAME }}
           password: ${{ secrets.SDU_SSH_PASSWORD }}
           port: 22
-          source: dist/builds/linux/${{ env.ARCH }}/Rosetta-*.AppImage
+          source: dist/builds/linux/${{ matrix.out_dir }}/Rosetta-*.AppImage
-          target: ${{ secrets.SDU_SSH_KERNEL }}/linux/${{ env.ARCH }}
+          target: ${{ secrets.SDU_SSH_KERNEL }}/linux/${{ matrix.arch }}
           strip_components: 4
           rm: true