Актуализация ветки Dev #2

Merged
Royce59 merged 43 commits from main into dev 2026-02-18 17:08:04 +00:00
4 changed files with 249 additions and 2 deletions
Showing only changes of commit 9410b0f1e6 - Show all commits

View File

@@ -3,6 +3,11 @@ name: MacOS Kernel Build
#Запускаем только кнопкой "Run workflow" в Actions -> Build MacOS
on:
workflow_dispatch:
push:
branches:
- main
paths:
- 'lib/**'
jobs:
build:
@@ -15,6 +20,16 @@ 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-${{ hashFiles('**/package.json') }}
restore-keys: |
${{ runner.os }}-npm-
if-no-files-found: ignore
# Кэш для electron-builder
- name: Cache electron-builder
uses: actions/cache@v5
@@ -37,8 +52,20 @@ jobs:
run: npm run kernel:mac
#Загружаем на удаленный сервер по SSH используя scp и пароль из секретов
#Загружаем из двух папок dist/builds/darwin/x64 и dist/builds/darwin/arm64, так как electron-builder может создавать разные файлы для разных архитектур
#Вызываем файл sshupload.sh и передаем ему параметры из секретов, чтобы не хранить пароль в открытом виде в workflow
- name: Upload to SSH using scp
shell: bash
run: |
scp -o StrictHostKeyChecking=no dist/builds/darwin/arm64/Rosetta-*.pkg "${{ secrets.SSH_USERNAME }}@${{ secrets.SSH_HOST }}:${{ secrets.SSH_TARGET_DIR }}/darwin/arm64" <<< "${{ secrets.SSH_PASSWORD }}"
scp -o StrictHostKeyChecking=no dist/builds/darwin/x64/Rosetta-*.pkg "${{ secrets.SSH_USERNAME }}@${{ secrets.SSH_HOST }}:${{ secrets.SSH_TARGET_DIR }}/darwin/x64" <<< "${{ secrets.SSH_PASSWORD }}"
"$GITHUB_WORKSPACE/.gitea/workflows/sshupload.sh" \
-l "$GITHUB_WORKSPACE/dist/builds/darwin/x64/Rosetta-*.dmg" \
-r "${{ secrets.SSH_TARGET_DIR }}/darwin/x64" \
-s "${{ secrets.SSH_HOST }}" \
-u "${{ secrets.SSH_USERNAME }}" \
-p '${{ secrets.SSH_PASSWORD }}'
"$GITHUB_WORKSPACE/.gitea/workflows/sshupload.sh" \
-l "$GITHUB_WORKSPACE/dist/builds/darwin/arm64/Rosetta-*.dmg" \
-r "${{ secrets.SSH_TARGET_DIR }}/darwin/arm64" \
-s "${{ secrets.SSH_HOST }}" \
-u "${{ secrets.SSH_USERNAME }}" \
-p '${{ secrets.SSH_PASSWORD }}'

View File

@@ -0,0 +1,71 @@
name: Linux Kernel Build
#Запускаем только кнопкой "Run workflow" в Actions
on:
workflow_dispatch:
push:
branches:
- main
paths:
- 'lib/**'
jobs:
build:
runs-on: macos
steps:
- name: Checkout code
uses: actions/checkout@v6
- name: Install Node.js
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-${{ hashFiles('**/package.json') }}
restore-keys: |
${{ runner.os }}-npm-
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-builder-${{ hashFiles('**/electron-builder.yml') }}
restore-keys: |
${{ runner.os }}-electron-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
- name: Build the application
run: npm run kernel:linux
#Загружаем на удаленный сервер по SSH используя scp и пароль из секретов
#Загружаем из двух папок dist/builds/darwin/x64 и dist/builds/darwin/arm64, так как electron-builder может создавать разные файлы для разных архитектур
#Вызываем файл sshupload.sh и передаем ему параметры из секретов, чтобы не хранить пароль в открытом виде в workflow
- name: Upload to SSH
shell: bash
run: |
"$GITHUB_WORKSPACE/.gitea/workflows/sshupload.sh" \
-l "$GITHUB_WORKSPACE/dist/builds/linux/x64/Rosetta-*.AppImage" \
-r "${{ secrets.SSH_TARGET_DIR }}/linux/x64" \
-s "${{ secrets.SSH_HOST }}" \
-u "${{ secrets.SSH_USERNAME }}" \
-p '${{ secrets.SSH_PASSWORD }}'
"$GITHUB_WORKSPACE/.gitea/workflows/sshupload.sh" \
-l "$GITHUB_WORKSPACE/dist/builds/linux/arm64/Rosetta-*.AppImage" \
-r "${{ secrets.SSH_TARGET_DIR }}/linux/arm64" \
-s "${{ secrets.SSH_HOST }}" \
-u "${{ secrets.SSH_USERNAME }}" \
-p '${{ secrets.SSH_PASSWORD }}'

View File

@@ -0,0 +1,82 @@
name: SP Builds
#Запускаем только кнопкой "Run workflow" в Actions -> Build MacOS
on:
workflow_dispatch:
push:
branches:
- main
paths:
- 'lib/**'
jobs:
build:
strategy:
matrix:
os: [macos, ubuntu]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout code
uses: actions/checkout@v6
- name: Install Node.js
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-${{ hashFiles('**/package.json') }}
restore-keys: |
${{ runner.os }}-npm-
if-no-files-found: ignore
# Кэш для electron-builder (macOS)
- name: Cache electron-builder (macOS)
if: matrix.os == 'macos'
uses: actions/cache@v5
with:
path: |
${{ env.HOME }}/Library/Caches/electron-builder
${{ env.HOME }}/Library/Caches/electron
key: ${{ runner.os }}-electron-builder-${{ hashFiles('**/electron-builder.yml') }}
restore-keys: |
${{ runner.os }}-electron-builder-
if-no-files-found: ignore
# Кэш для electron-builder (Ubuntu)
- name: Cache electron-builder (Ubuntu)
if: matrix.os == 'ubuntu'
uses: actions/cache@v5
with:
path: |
${{ env.HOME }}/.cache/electron-builder
${{ env.HOME }}/.cache/electron
key: ${{ runner.os }}-electron-builder-${{ hashFiles('**/electron-builder.yml') }}
restore-keys: |
${{ runner.os }}-electron-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
- name: Build the application
run: npm run kernel:linux
#Загружаем на удаленный сервер по SSH используя scp и пароль из секретов
#Загружаем из двух папок dist/builds/darwin/x64 и dist/builds/darwin/arm64, так как electron-builder может создавать разные файлы для разных архитектур
- name: Upload to SSH
shell: bash
run: |
"$GITHUB_WORKSPACE/.gitea/workflows/sshupload.sh" \
-l "$GITHUB_WORKSPACE/packs/*" \
-r "${{ secrets.SDU_SSH_PACKS }}" \
-s "${{ secrets.SSH_HOST }}" \
-u "${{ secrets.SSH_USERNAME }}" \
-p '${{ secrets.SSH_PASSWORD }}'

View File

@@ -0,0 +1,67 @@
#!/usr/bin/env bash
set -euo pipefail
usage() {
cat <<'EOF'
Usage: sshupload.sh -l <local_glob> -r <remote_dir> -s <server> -u <user> -p <password>
EOF
}
local_glob=""
remote_dir=""
server=""
user=""
password=""
while [[ $# -gt 0 ]]; do
case "$1" in
-l|--local) local_glob="$2"; shift 2;;
-r|--remote) remote_dir="$2"; shift 2;;
-s|--server) server="$2"; shift 2;;
-u|--user) user="$2"; shift 2;;
-p|--password) password="$2"; shift 2;;
-h|--help) usage; exit 0;;
*) echo "Unknown arg: $1" >&2; usage; exit 1;;
esac
done
if [[ -z "$local_glob" || -z "$remote_dir" || -z "$server" || -z "$user" || -z "$password" ]]; then
echo "Missing required params" >&2
usage
exit 1
fi
# Ensure sshpass installed
if ! command -v sshpass >/dev/null 2>&1; then
if command -v brew >/dev/null 2>&1; then
brew update
brew install hudochenkov/sshpass/sshpass
elif command -v apt-get >/dev/null 2>&1; then
sudo apt-get update
sudo apt-get install -y sshpass
else
echo "sshpass not found and no supported package manager" >&2
exit 1
fi
fi
user_host="${user}@${server}"
# Ensure remote dir exists and clear it
sshpass -p "$password" ssh -o StrictHostKeyChecking=no "$user_host" "mkdir -p '$remote_dir' && rm -f '$remote_dir'/*"
# Expand glob (supports ~ and patterns) and upload each file (compatible with macOS bash 3.x)
shopt -s nullglob
eval "files=( ${local_glob} )"
shopt -u nullglob
if [[ ${#files[@]} -eq 0 ]]; then
echo "No files matched: $local_glob" >&2
exit 1
fi
for f in "${files[@]}"; do
sshpass -p "$password" scp -o StrictHostKeyChecking=no "$f" "$user_host:$remote_dir/"
done
echo "Upload completed"