From 78b1088b41715f0e567ea0e06872a094a5bff4e6 Mon Sep 17 00:00:00 2001 From: "Mr. M" Date: Thu, 24 Jul 2025 16:38:02 +0200 Subject: [PATCH] fix: Make sure to source cargo env before building, b=no-bug, c=workflows --- .github/workflows/linux-release-build.yml | 5 ----- .github/workflows/src/release-build.sh | 2 ++ package.json | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/linux-release-build.yml b/.github/workflows/linux-release-build.yml index 68bfd28cb..92787667d 100644 --- a/.github/workflows/linux-release-build.yml +++ b/.github/workflows/linux-release-build.yml @@ -117,11 +117,6 @@ jobs: ./mach --no-interactive bootstrap --application-choice browser cd .. - - name: Install Rust - run: | - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain $(cat .rust-toolchain) - source $HOME/.cargo/env - - name: Insert API Keys run: | mkdir -p ~/.zen-keys diff --git a/.github/workflows/src/release-build.sh b/.github/workflows/src/release-build.sh index 1de5d7c92..853f55b3a 100644 --- a/.github/workflows/src/release-build.sh +++ b/.github/workflows/src/release-build.sh @@ -8,6 +8,8 @@ if command -v apt-get &> /dev/null; then sudo apt-get install -y xvfb libnvidia-egl-wayland1 mesa-utils libgl1-mesa-dri fi +. $HOME/.cargo/env + ulimit -n 4096 if command -v Xvfb &> /dev/null; then diff --git a/package.json b/package.json index a2b0ecb3b..7dc45babd 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "surfer": "surfer", "test": "python3 scripts/run_tests.py", "test:dbg": "python3 scripts/run_tests.py --jsdebugger --debug-on-failure", - "ffprefs": "cd tools/ffprefs && cargo run --release --bin ffprefs -- ../../", + "ffprefs": "cd tools/ffprefs && cargo run --bin ffprefs -- ../../", "lc": "surfer license-check", "lc:fix": "surfer license-check --fix" },