From 23939877588554109e345ab7d7a92d4ed70dc74a Mon Sep 17 00:00:00 2001 From: MickLesk <47820557+MickLesk@users.noreply.github.com> Date: Wed, 26 Aug 2026 16:07:51 +0200 Subject: [PATCH] scanopy: drop unneeded rust build, use committed UI fixtures --- ct/scanopy.sh | 10 ---------- install/scanopy-install.sh | 20 -------------------- 2 files changed, 30 deletions(-) diff --git a/ct/scanopy.sh b/ct/scanopy.sh index bb93b719c..becb87a55 100644 --- a/ct/scanopy.sh +++ b/ct/scanopy.sh @@ -42,10 +42,6 @@ function update_script() { restore_backup - ensure_dependencies pkg-config libssl-dev - TOOLCHAIN="$(grep "channel" /opt/scanopy/backend/rust-toolchain.toml | awk -F\" '{print $2}')" - RUST_TOOLCHAIN=$TOOLCHAIN setup_rust - if ! grep -q "PUBLIC_URL" /opt/scanopy/.env; then sed -i "\|_PATH=|a\\scanopy_PUBLIC_URL=http://${LOCAL_IP}:60072" /opt/scanopy/.env fi @@ -53,12 +49,6 @@ function update_script() { fetch_and_deploy_gh_release "scanopy-server" "scanopy/scanopy" "singlefile" "latest" "/usr/bin" "scanopy-server-linux-$(arch_resolve)" - msg_info "Generating UI Fixtures (patience)" - cd /opt/scanopy/backend - CARGO_PROFILE_RELEASE_LTO=false CARGO_PROFILE_RELEASE_CODEGEN_UNITS=16 CARGO_BUILD_JOBS="$(get_parallel_jobs)" $STD cargo build --release --bin generate-fixtures - $STD ./target/release/generate-fixtures --output-dir /opt/scanopy/ui/src/lib/data - msg_ok "Generated UI Fixtures" - msg_info "Creating frontend UI" export PUBLIC_SERVER_HOSTNAME=default export PUBLIC_SERVER_PORT="" diff --git a/install/scanopy-install.sh b/install/scanopy-install.sh index 862c0b6bf..42d922606 100644 --- a/install/scanopy-install.sh +++ b/install/scanopy-install.sh @@ -13,32 +13,12 @@ setting_up_container network_check update_os -msg_info "Installing Dependencies" -$STD apt install -y \ - build-essential \ - libssl-dev \ - pkg-config -msg_ok "Installed Dependencies" - PG_VERSION=17 setup_postgresql NODE_VERSION="24" setup_nodejs PG_DB_NAME="scanopy_db" PG_DB_USER="scanopy" PG_DB_GRANT_SUPERUSER="true" setup_postgresql_db fetch_and_deploy_gh_release "Scanopy" "scanopy/scanopy" "tarball" "latest" "/opt/scanopy" -TOOLCHAIN="$(grep "channel" /opt/scanopy/backend/rust-toolchain.toml | awk -F\" '{print $2}')" -RUST_TOOLCHAIN=$TOOLCHAIN setup_rust - fetch_and_deploy_gh_release "scanopy-server" "scanopy/scanopy" "singlefile" "latest" "/usr/bin" "scanopy-server-linux-$(arch_resolve)" -msg_info "Generating UI Fixtures (patience)" -cd /opt/scanopy/backend -# Server binary is prebuilt above; generate-fixtures is a throwaway build-time -# tool with no prebuilt release, but shares the crate's release profile -# (lto + codegen-units=1) that caused the OOM, so relax it here - its own -# binary size/speed doesn't matter, only the fixture JSON it emits. -CARGO_PROFILE_RELEASE_LTO=false CARGO_PROFILE_RELEASE_CODEGEN_UNITS=16 CARGO_BUILD_JOBS="$(get_parallel_jobs)" $STD cargo build --release --bin generate-fixtures -$STD ./target/release/generate-fixtures --output-dir /opt/scanopy/ui/src/lib/data -msg_ok "Generated UI Fixtures" - msg_info "Creating frontend UI" export PUBLIC_SERVER_HOSTNAME=default export PUBLIC_SERVER_PORT=""