From c1d2b04e4575b8837e4529861e172bdc343c654c Mon Sep 17 00:00:00 2001 From: matei jordache Date: Mon, 30 Mar 2026 00:33:40 -0700 Subject: [PATCH] harmonize build scripts --- .github/workflows/build.yml | 8 +++++--- scripts/build-linux.sh | 1 - scripts/build-mac.sh | 1 - scripts/build-windows.ps1 | 1 - 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 83b0e71..314401b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,13 +13,13 @@ jobs: include: - os: macos-latest label: macOS - build_cmd: bash scripts/build-mac.sh + build_cmd: npm run build:mac artifact_path: desktop-dist/tono.dmg artifact_name: tono-macos - os: ubuntu-latest label: Linux - build_cmd: bash scripts/build-linux.sh + build_cmd: npm run build:linux artifact_path: desktop-dist/tono-linux.tar.gz artifact_name: tono-linux @@ -45,10 +45,12 @@ jobs: node-version: "20" cache: npm - # Build scripts call `uv pip install` for Python deps - name: Install uv run: pip install uv + - name: Create venv + run: uv venv --python 3.13 + # Linux: pywebview needs webkit2gtk headers to import during PyInstaller collection - name: Install Linux system dependencies if: runner.os == 'Linux' diff --git a/scripts/build-linux.sh b/scripts/build-linux.sh index fba1826..942433c 100755 --- a/scripts/build-linux.sh +++ b/scripts/build-linux.sh @@ -15,7 +15,6 @@ done REPO_ROOT="$(cd "$(dirname "$0")/.." && pwd)" cd "$REPO_ROOT" -uv venv --python 3.13 source .venv/bin/activate if [ -d ".venv/bin" ]; then diff --git a/scripts/build-mac.sh b/scripts/build-mac.sh index b7ce450..2fb19fe 100755 --- a/scripts/build-mac.sh +++ b/scripts/build-mac.sh @@ -15,7 +15,6 @@ done REPO_ROOT="$(cd "$(dirname "$0")/.." && pwd)" cd "$REPO_ROOT" -uv venv --python 3.13 source .venv/bin/activate if [ -d ".venv/bin" ]; then diff --git a/scripts/build-windows.ps1 b/scripts/build-windows.ps1 index 11316dc..fec1bc5 100644 --- a/scripts/build-windows.ps1 +++ b/scripts/build-windows.ps1 @@ -30,7 +30,6 @@ function Assert-LastExitCode { $repoRoot = Split-Path -Parent $PSScriptRoot Set-Location $repoRoot -uv venv --python 3.13 ./.venv/Scripts/Activate $pythonExe = if (Test-Path ".\.venv\Scripts\python.exe") {