diff --git a/.gitea/workflows/linux.yaml b/.gitea/workflows/linux.yaml index 3e24f10..a345b1c 100644 --- a/.gitea/workflows/linux.yaml +++ b/.gitea/workflows/linux.yaml @@ -11,7 +11,7 @@ on: jobs: build: - runs-on: macos + runs-on: linux steps: - name: Checkout code uses: actions/checkout@v6 @@ -20,34 +20,8 @@ jobs: uses: actions/setup-node@v6 with: node-version: '22' - - # Кэш npm (тарифы грузятся из ~/.npm-cache на macOS) - - name: Cache npm cache - uses: actions/cache@v5 - with: - path: ${{ env.HOME }}/.npm-cache - key: ${{ runner.os }}-npm-linux-${{ hashFiles('**/package.json') }} - restore-keys: | - ${{ runner.os }}-npm-linux- - if-no-files-found: ignore - # Кэш для electron-builder - - name: Cache electron-builder - uses: actions/cache@v5 - with: - path: | - ${{ env.HOME }}/Library/Caches/electron-builder - ${{ env.HOME }}/Library/Caches/electron - key: ${{ runner.os }}-electron-linux-builder-${{ hashFiles('**/electron-builder.yml') }} - restore-keys: | - ${{ runner.os }}-electron-linux-builder- - if-no-files-found: ignore - - name: NPM offline setup - shell: bash - run: | - 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 + run: npm install --no-audit --no-fund - name: Build the application run: npm run kernel:linux #Загружаем на удаленный сервер по SSH используя scp и пароль из секретов diff --git a/.gitea/workflows/service-packs.yaml b/.gitea/workflows/service-packs.yaml index 864a525..9ce0ca3 100644 --- a/.gitea/workflows/service-packs.yaml +++ b/.gitea/workflows/service-packs.yaml @@ -53,7 +53,7 @@ jobs: #Собираем Kernel чтобы свежие файлы попали в папку out - name: Build the application run: npm run kernel:linux - + #Собираем сервисные пакеты для всех платформ - name: Build SP shell: bash diff --git a/package.json b/package.json index b1a4b56..153dc92 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "start": "electron-vite preview", "postinstall": "electron-builder install-app-deps", "build:unpack": "electron-vite build && electron-builder --dir", - "kernel:win": "mkdir -p \"dist/builds/win32/x64\" && electron-vite build && electron-builder --win --x64", + "kernel:win": "mkdir \"dist/builds/win/x64\" && electron-vite build && electron-builder --win --x64", "kernel:darwin-arm64": "electron-vite build && electron-builder --mac --arm64", "kernel:darwin-x64": "electron-vite build && electron-builder --mac --x64", "kernel:mac": "mkdir -p dist/builds/darwin/arm64 dist/builds/darwin/x64 && npm run kernel:darwin-x64 && npm run kernel:darwin-arm64",