From a298aafb67015622bcd2d033d08c8a43741a9d33 Mon Sep 17 00:00:00 2001 From: Ivan Date: Fri, 3 Apr 2026 12:58:17 -0500 Subject: [PATCH] chore(package): update build scripts in package.json to use cross-env for platform-specific builds and add codec2 installation in GitHub CI script for macOS --- package.json | 17 +++++++++-------- scripts/ci/github-install-deps.sh | 11 +++++++++++ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 35a3060..3214c27 100644 --- a/package.json +++ b/package.json @@ -26,14 +26,14 @@ "electron-postinstall": "electron-builder install-app-deps", "electron": "pnpm run electron-postinstall && pnpm run build && electron .", "dist": "pnpm run electron-postinstall && pnpm run build && electron-builder --publish=never", - "dist:linux": "pnpm run electron-postinstall && PLATFORM=linux pnpm run build && electron-builder --linux AppImage deb --publish=never", - "dist:linux-x64": "pnpm run electron-postinstall && PLATFORM=linux ARCH=x64 pnpm run build && electron-builder --linux AppImage deb --x64 --publish=never", - "dist:linux-arm64": "pnpm run electron-postinstall && PLATFORM=linux ARCH=arm64 pnpm run build && electron-builder --linux AppImage deb --arm64 --publish=never", - "dist:rpm": "pnpm run electron-postinstall && PLATFORM=linux pnpm run build && electron-builder --linux rpm --publish=never", - "dist:flatpak": "pnpm run electron-postinstall && PLATFORM=linux pnpm run build && electron-builder --linux flatpak --publish=never", - "dist:windows": "pnpm run electron-postinstall && PLATFORM=win32 pnpm run build && electron-builder --win portable nsis --publish=never", - "dist:win-x64": "pnpm run electron-postinstall && PLATFORM=win32 ARCH=x64 pnpm run build && electron-builder --win portable nsis --x64 --publish=never", - "dist:win-arm64": "pnpm run electron-postinstall && PLATFORM=win32 ARCH=arm64 pnpm run build && electron-builder --win portable nsis --arm64 --publish=never", + "dist:linux": "pnpm run electron-postinstall && cross-env PLATFORM=linux pnpm run build && electron-builder --linux AppImage deb --publish=never", + "dist:linux-x64": "pnpm run electron-postinstall && cross-env PLATFORM=linux ARCH=x64 pnpm run build && electron-builder --linux AppImage deb --x64 --publish=never", + "dist:linux-arm64": "pnpm run electron-postinstall && cross-env PLATFORM=linux ARCH=arm64 pnpm run build && electron-builder --linux AppImage deb --arm64 --publish=never", + "dist:rpm": "pnpm run electron-postinstall && cross-env PLATFORM=linux pnpm run build && electron-builder --linux rpm --publish=never", + "dist:flatpak": "pnpm run electron-postinstall && cross-env PLATFORM=linux pnpm run build && electron-builder --linux flatpak --publish=never", + "dist:windows": "pnpm run electron-postinstall && cross-env PLATFORM=win32 pnpm run build && electron-builder --win portable nsis --publish=never", + "dist:win-x64": "pnpm run electron-postinstall && cross-env PLATFORM=win32 ARCH=x64 pnpm run build && electron-builder --win portable nsis --x64 --publish=never", + "dist:win-arm64": "pnpm run electron-postinstall && cross-env PLATFORM=win32 ARCH=arm64 pnpm run build && electron-builder --win portable nsis --arm64 --publish=never", "dist:zip": "pnpm run electron-postinstall && pnpm run build && electron-forge make --targets @electron-forge/maker-zip", "dist-prebuilt": "pnpm run electron-postinstall && pnpm run build-backend && electron-builder --publish=never", "dist:mac-arm64": "pnpm run electron-postinstall && pnpm run build && electron-builder --mac --arm64 --publish=never", @@ -67,6 +67,7 @@ "@vue/eslint-config-prettier": "^10.2.0", "@vue/test-utils": "^2.4.6", "autoprefixer": "^10.4.27", + "cross-env": "^10.1.0", "electron": "^39.8.6", "electron-builder": "^26.8.1", "electron-builder-squirrel-windows": "^26.8.1", diff --git a/scripts/ci/github-install-deps.sh b/scripts/ci/github-install-deps.sh index 8a2ccc4..6d6cf57 100755 --- a/scripts/ci/github-install-deps.sh +++ b/scripts/ci/github-install-deps.sh @@ -7,5 +7,16 @@ cd "$ROOT" export GIT_TERMINAL_PROMPT=0 +# pycodec2 builds against libcodec2 +if [[ "$(uname -s)" == "Darwin" ]]; then + brew install codec2 + _codec2_prefix="$(brew --prefix codec2)" + export CPPFLAGS="${CPPFLAGS:-} -I${_codec2_prefix}/include" + export LDFLAGS="${LDFLAGS:-} -L${_codec2_prefix}/lib" + if [[ -d "${_codec2_prefix}/lib/pkgconfig" ]]; then + export PKG_CONFIG_PATH="${_codec2_prefix}/lib/pkgconfig:${PKG_CONFIG_PATH:-}" + fi +fi + python -m poetry install --no-interaction --no-ansi pnpm install --frozen-lockfile