From 04cd27a5f382739f64080d8586e20476cf34cccb Mon Sep 17 00:00:00 2001 From: Royce59 Date: Sat, 21 Mar 2026 19:41:14 +0000 Subject: [PATCH 1/4] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20.gitea/workflows/service-packs.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/service-packs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/service-packs.yaml b/.gitea/workflows/service-packs.yaml index b0e3864..7183c6f 100644 --- a/.gitea/workflows/service-packs.yaml +++ b/.gitea/workflows/service-packs.yaml @@ -11,7 +11,7 @@ on: jobs: build: - runs-on: macos + runs-on: linux steps: - name: Checkout code uses: actions/checkout@v6 From 013a5d9f1714cfc150aae0f082aec8134a683791 Mon Sep 17 00:00:00 2001 From: Royce59 Date: Tue, 24 Mar 2026 14:13:09 +0000 Subject: [PATCH 2/4] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20.gitea/workflows/linux.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/linux.yaml | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/.gitea/workflows/linux.yaml b/.gitea/workflows/linux.yaml index 9c4abdd..6ed6918 100644 --- a/.gitea/workflows/linux.yaml +++ b/.gitea/workflows/linux.yaml @@ -8,7 +8,7 @@ on: branches: - main paths: - - 'lib/**' + - 'lib/**' jobs: build: @@ -17,10 +17,13 @@ jobs: fail-fast: false matrix: arch: [x64, arm64] + env: + ARCH: ${{ matrix.arch }} + steps: - name: Checkout code uses: actions/checkout@v6 - + - name: Install Node.js uses: actions/setup-node@v6 with: @@ -53,28 +56,32 @@ jobs: - name: Install npm dependencies run: npm install --no-audit --no-fund - - name: Build the application (${{ matrix.arch }}) + - name: Debug ARCH run: | - npx electron-vite build - npx electron-builder --linux --${{ matrix.arch }} + echo "matrix.arch = ${{ matrix.arch }}" + echo "ARCH = $ARCH" - - name: Check if files exist (${{ matrix.arch }}) + - name: Build the application (${{ env.ARCH }}) + run: | + mkdir -p dist/builds/linux/$ARCH + mkdir -p dist/builds/linux/x86_64 + npx electron-vite build + npx electron-builder --linux --$ARCH + + - name: Check if files exist (${{ env.ARCH }}) run: | echo "=== Checking dist structure ===" - find dist/builds/linux/${{ matrix.arch }} -type f -name "*.AppImage" 2>/dev/null || echo "No AppImage files found" - ls -la dist/builds/linux/${{ matrix.arch }}/ 2>/dev/null || echo "arch folder not found" + find dist/builds/linux/$ARCH -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" - - name: Install SCP in Docker container - run: apt-get install -y openssh-client - - - name: Upload ${{ matrix.arch }} to SSH using SCP + - name: Upload ${{ env.ARCH }} 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/${{ matrix.arch }}/Rosetta-*.AppImage" - target: "${{ secrets.SDU_SSH_KERNEL }}/linux/${{ matrix.arch }}" + source: dist/builds/linux/${{ env.ARCH }}/Rosetta-*.AppImage + target: ${{ secrets.SDU_SSH_KERNEL }}/linux/${{ env.ARCH }} strip_components: 4 rm: true \ No newline at end of file From 0e5384b90885616424f3494a17c8e00892c8788d Mon Sep 17 00:00:00 2001 From: RoyceDa Date: Tue, 24 Mar 2026 16:19:07 +0200 Subject: [PATCH 3/4] ci/cd test --- .gitea/workflows/linux.yaml | 45 ++++++++----------------------------- 1 file changed, 9 insertions(+), 36 deletions(-) diff --git a/.gitea/workflows/linux.yaml b/.gitea/workflows/linux.yaml index 6ed6918..1138b39 100644 --- a/.gitea/workflows/linux.yaml +++ b/.gitea/workflows/linux.yaml @@ -17,8 +17,6 @@ jobs: fail-fast: false matrix: arch: [x64, arm64] - env: - ARCH: ${{ matrix.arch }} steps: - name: Checkout code @@ -29,59 +27,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 = $ARCH" - - name: Build the application (${{ env.ARCH }}) + - name: Build the application run: | - mkdir -p dist/builds/linux/$ARCH + mkdir -p dist/builds/linux/${{ matrix.arch }} mkdir -p dist/builds/linux/x86_64 npx electron-vite build - npx electron-builder --linux --$ARCH + npx electron-builder --linux --${{ matrix.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" - ls -la dist/builds/linux/$ARCH/ 2>/dev/null || echo "arch folder not found" + find dist/builds/linux/${{ matrix.arch }} -type f -name "*.AppImage" 2>/dev/null || echo "No AppImage files found" + ls -la dist/builds/linux/${{ matrix.arch }}/ 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 - target: ${{ secrets.SDU_SSH_KERNEL }}/linux/${{ env.ARCH }} + source: dist/builds/linux/${{ matrix.arch }}/Rosetta-*.AppImage + target: ${{ secrets.SDU_SSH_KERNEL }}/linux/${{ matrix.arch }} strip_components: 4 rm: true \ No newline at end of file From e4da2510ccff7d9e7eb740288a63c8fb1d8ce565 Mon Sep 17 00:00:00 2001 From: RoyceDa Date: Tue, 24 Mar 2026 16:35:01 +0200 Subject: [PATCH 4/4] =?UTF-8?q?=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20CI/CD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/darwin.yaml | 7 ++++--- .gitea/workflows/linux.yaml | 19 +++++++++++-------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.gitea/workflows/darwin.yaml b/.gitea/workflows/darwin.yaml index 9c067f7..1bb24b6 100644 --- a/.gitea/workflows/darwin.yaml +++ b/.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 }} diff --git a/.gitea/workflows/linux.yaml b/.gitea/workflows/linux.yaml index 1138b39..f2e0311 100644 --- a/.gitea/workflows/linux.yaml +++ b/.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,7 +15,11 @@ jobs: strategy: fail-fast: false matrix: - arch: [x64, arm64] + include: + - arch: x64 + out_dir: x86_64 + - arch: arm64 + out_dir: arm64 steps: - name: Checkout code @@ -32,20 +35,20 @@ jobs: - name: Debug ARCH run: | - echo "matrix.arch = ${{ matrix.arch }}" + echo "arch=${{ matrix.arch }}" + echo "out_dir=${{ matrix.out_dir }}" - name: Build the application run: | - mkdir -p dist/builds/linux/${{ matrix.arch }} - mkdir -p dist/builds/linux/x86_64 + mkdir -p dist/builds/linux/${{ matrix.out_dir }} npx electron-vite build npx electron-builder --linux --${{ matrix.arch }} - name: Check if files exist run: | echo "=== Checking dist structure ===" - find dist/builds/linux/${{ matrix.arch }} -type f -name "*.AppImage" 2>/dev/null || echo "No AppImage files found" - ls -la dist/builds/linux/${{ matrix.arch }}/ 2>/dev/null || echo "arch folder not 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/${{ matrix.out_dir }}/ 2>/dev/null || echo "arch folder not found" - name: Upload to SSH using SCP uses: appleboy/scp-action@master @@ -54,7 +57,7 @@ jobs: username: ${{ secrets.SDU_SSH_USERNAME }} password: ${{ secrets.SDU_SSH_PASSWORD }} port: 22 - source: dist/builds/linux/${{ matrix.arch }}/Rosetta-*.AppImage + source: dist/builds/linux/${{ matrix.out_dir }}/Rosetta-*.AppImage target: ${{ secrets.SDU_SSH_KERNEL }}/linux/${{ matrix.arch }} strip_components: 4 rm: true \ No newline at end of file