baikal: fall back to composer update when lock doesn't match composer.json

2026-08-20 11:32:42 +02:00 · 2026-08-19 22:40:21 +02:00
4 changed files with 4 additions and 4 deletions
@@ -46,7 +46,7 @@ function update_script() {

    msg_info "Configuring Baikal"
    cd /opt/baikal
-    $STD composer install
+    $STD composer install || { msg_warn "composer.lock doesn't match composer.json (known upstream packaging issue) - regenerating"; $STD composer update; }
    msg_ok "Configured Baikal"

    msg_info "Starting Service"
@@ -53,7 +53,7 @@ function update_script() {

    msg_info "Building Scanopy Server (patience)"
    cd /opt/scanopy/backend
-    CARGO_BUILD_JOBS="$(get_parallel_jobs)" $STD cargo build --release --bin server --bin generate-fixtures
+    $STD cargo build --release --bin server --bin generate-fixtures
    $STD ./target/release/generate-fixtures --output-dir /opt/scanopy/ui/src/lib/data
    mv ./target/release/server /usr/bin/scanopy-server
    msg_ok "Built Scanopy Server"
@@ -25,7 +25,7 @@ PG_DB_NAME="baikal_db" PG_DB_USER="baikal_user" PG_DB_PASS="$(openssl rand -base

 msg_info "Configuring Baikal"
 cd /opt/baikal
-$STD composer install
+$STD composer install || { msg_warn "composer.lock doesn't match composer.json (known upstream packaging issue) - regenerating"; $STD composer update; }
 cat <<EOF >/opt/baikal/config/baikal.yaml
 database:
    backend: pgsql
@@ -29,7 +29,7 @@ RUST_TOOLCHAIN=$TOOLCHAIN setup_rust

 msg_info "Building Scanopy Server (patience)"
 cd /opt/scanopy/backend
-CARGO_BUILD_JOBS="$(get_parallel_jobs)" $STD cargo build --release --bin server --bin generate-fixtures
+$STD cargo build --release --bin server --bin generate-fixtures
 $STD ./target/release/generate-fixtures --output-dir /opt/scanopy/ui/src/lib/data
 mv ./target/release/server /usr/bin/scanopy-server
 msg_ok "Built Scanopy Server"