From 16415299ae8a261ead0862000b68e931553cb2bf Mon Sep 17 00:00:00 2001 From: bincxz <16399091+binaricat@users.noreply.github.com> Date: Sat, 21 Mar 2026 04:13:31 +0800 Subject: [PATCH] fix: repair linux node-pty packaging workflow --- .github/workflows/build.yml | 4 +++- scripts/ensure-node-pty-linux.sh | 29 ++++++++++++++++++----------- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cd1aed6f0..c6260b766 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -161,7 +161,9 @@ jobs: - name: Install build dependencies run: | apt-get update - apt-get install -y curl build-essential python3 git libfuse2 file rpm + apt-get install -y curl build-essential python3 git libfuse2 file rpm \ + libglib2.0-0 libgtk-3-0 libnss3 libxss1 libxtst6 libasound2 \ + libatk-bridge2.0-0 libdrm2 libgbm1 libx11-xcb1 libxcb-dri3-0 curl -fsSL https://deb.nodesource.com/setup_22.x | bash - apt-get install -y nodejs diff --git a/scripts/ensure-node-pty-linux.sh b/scripts/ensure-node-pty-linux.sh index 969194ca1..02a22d2c1 100644 --- a/scripts/ensure-node-pty-linux.sh +++ b/scripts/ensure-node-pty-linux.sh @@ -26,6 +26,17 @@ log_file_info() { checksum "${file}" } +log_optional_spawn_helper() { + local file="$1" + + if [[ -f "${file}" ]]; then + test -x "${file}" + log_file_info "${file}" + else + echo "[node-pty] spawn-helper not present at ${file} (expected on Linux)" + fi +} + log_electron_runtime_info() { ELECTRON_RUN_AS_NODE=1 "$(electron_bin)" -e ' console.log(`[node-pty] electron=${process.versions.electron || "unknown"} node=${process.versions.node} modules=${process.versions.modules}`); @@ -52,21 +63,21 @@ prepare() { npx electron-rebuild test -f "${release_dir}/pty.node" - test -f "${release_dir}/spawn-helper" - test -x "${release_dir}/spawn-helper" echo "[node-pty] built Linux runtime artifacts:" log_file_info "${release_dir}/pty.node" - log_file_info "${release_dir}/spawn-helper" + log_optional_spawn_helper "${release_dir}/spawn-helper" assert_loadable_native_module "${release_dir}/pty.node" mkdir -p "${prebuild_dir}" cp "${release_dir}/pty.node" "${prebuild_dir}/pty.node" - cp "${release_dir}/spawn-helper" "${prebuild_dir}/spawn-helper" + if [[ -f "${release_dir}/spawn-helper" ]]; then + cp "${release_dir}/spawn-helper" "${prebuild_dir}/spawn-helper" + fi echo "[node-pty] mirrored Linux runtime artifacts into ${prebuild_dir}:" log_file_info "${prebuild_dir}/pty.node" - log_file_info "${prebuild_dir}/spawn-helper" + log_optional_spawn_helper "${prebuild_dir}/spawn-helper" } verify() { @@ -90,20 +101,16 @@ verify() { fi test -f "${release_dir}/pty.node" - test -f "${release_dir}/spawn-helper" test -f "${prebuild_dir}/pty.node" - test -f "${prebuild_dir}/spawn-helper" - test -x "${release_dir}/spawn-helper" - test -x "${prebuild_dir}/spawn-helper" echo "[node-pty] packaged build/Release artifacts:" log_file_info "${release_dir}/pty.node" - log_file_info "${release_dir}/spawn-helper" + log_optional_spawn_helper "${release_dir}/spawn-helper" assert_loadable_native_module "${release_dir}/pty.node" echo "[node-pty] packaged prebuild artifacts:" log_file_info "${prebuild_dir}/pty.node" - log_file_info "${prebuild_dir}/spawn-helper" + log_optional_spawn_helper "${prebuild_dir}/spawn-helper" assert_loadable_native_module "${prebuild_dir}/pty.node" echo "[node-pty] packaged artifact locations:"