From 2ff93c8010391f02f68224f8461922ac6181641e Mon Sep 17 00:00:00 2001 From: zhom <2717306+zhom@users.noreply.github.com> Date: Thu, 29 May 2025 11:20:13 +0400 Subject: [PATCH] chore: attempt to fix nodecar build step --- .github/workflows/lint-rs.yml | 6 +++++- .github/workflows/release.yml | 1 + nodecar/src/proxy-runner.ts | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint-rs.yml b/.github/workflows/lint-rs.yml index f261ce9..0f84fed 100644 --- a/.github/workflows/lint-rs.yml +++ b/.github/workflows/lint-rs.yml @@ -46,18 +46,22 @@ jobs: with: components: rustfmt, clippy - - name: Install Linux dependencies + - name: Install dependencies (Ubuntu only) if: matrix.os == 'ubuntu-latest' run: | sudo apt-get update sudo apt install libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev + - name: Install frontend dependencies + run: pnpm install --frozen-lockfile + - name: Install nodecar dependencies run: | cd nodecar pnpm install --frozen-lockfile - name: Build nodecar binary + shell: bash run: | cd nodecar if [[ "${{ matrix.os }}" == "ubuntu-latest" ]]; then diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 80fd72f..fdb5168 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -92,6 +92,7 @@ jobs: pnpm install --frozen-lockfile - name: Build nodecar sidecar + shell: bash run: | cd nodecar pnpm run ${{ matrix.nodecar_script }} diff --git a/nodecar/src/proxy-runner.ts b/nodecar/src/proxy-runner.ts index 5bff9f1..c677cc8 100644 --- a/nodecar/src/proxy-runner.ts +++ b/nodecar/src/proxy-runner.ts @@ -8,6 +8,7 @@ import { deleteProxyConfig, isProcessRunning, generateProxyId, + listProxyConfigs, } from "./proxy-storage"; /** @@ -103,7 +104,7 @@ export async function stopProxyProcess(id: string): Promise { * @returns Promise resolving when all proxies are stopped */ export async function stopAllProxyProcesses(): Promise { - const configs = require("./proxy-storage").listProxyConfigs(); + const configs = listProxyConfigs(); for (const config of configs) { await stopProxyProcess(config.id);