From 165674a865c2ce769688f0f0d9357851910ac7b5 Mon Sep 17 00:00:00 2001 From: Codex Date: Wed, 29 Apr 2026 14:13:38 +0800 Subject: [PATCH] Keep Jenkins local deploy services alive --- scripts/deploy-rust-remote.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/scripts/deploy-rust-remote.sh b/scripts/deploy-rust-remote.sh index 1d949f16..74f32a77 100644 --- a/scripts/deploy-rust-remote.sh +++ b/scripts/deploy-rust-remote.sh @@ -278,7 +278,6 @@ fi TARGET_DIR="${BUILD_ROOT}/${BUILD_NAME}" WEB_DIR="${TARGET_DIR}/web" -ROOT_DIR_PLACEHOLDER="__GENARRATIVE_EMPTY_SPACETIME_ROOT_DIR__" API_BINARY_SOURCE="${SERVER_RS_DIR}/target/x86_64-unknown-linux-gnu/release/api-server" WASM_SOURCE="${SERVER_RS_DIR}/target/wasm32-unknown-unknown/release/spacetime_module.wasm" @@ -487,7 +486,7 @@ WEB_SERVER touch "${TARGET_DIR}/.env" for env_file in "${TARGET_DIR}/.env" "${TARGET_DIR}/.env.local"; do if [[ -f "${env_file}" ]] && ! grep -q '^GENARRATIVE_SPACETIME_ROOT_DIR=' "${env_file}"; then - printf '\nGENARRATIVE_SPACETIME_ROOT_DIR=%s\n' "${ROOT_DIR_PLACEHOLDER}" >>"${env_file}" + printf '\nGENARRATIVE_SPACETIME_ROOT_DIR=${SCRIPT_DIR}/.spacetimedb\n' >>"${env_file}" fi done @@ -795,7 +794,7 @@ start_process() { fi echo "[start] 启动 ${name}" - nohup "$@" >"${log_file}" 2>&1 & + JENKINS_NODE_COOKIE=dontKillMe BUILD_ID=dontKillMe nohup "$@" >"${log_file}" 2>&1 & echo "$!" >"${pid_file}" } @@ -883,8 +882,6 @@ replace_placeholder_in_file "${TARGET_DIR}/start.sh" "__GENARRATIVE_DEFAULT_API_ replace_placeholder_in_file "${TARGET_DIR}/start.sh" "__GENARRATIVE_DEFAULT_API_PORT__" "${API_PORT}" replace_placeholder_in_file "${TARGET_DIR}/start.sh" "__GENARRATIVE_DEFAULT_WEB_HOST__" "${WEB_HOST}" replace_placeholder_in_file "${TARGET_DIR}/start.sh" "__GENARRATIVE_DEFAULT_WEB_PORT__" "${WEB_PORT}" -replace_placeholder_in_file "${TARGET_DIR}/.env" "${ROOT_DIR_PLACEHOLDER}" "${TARGET_DIR}/.spacetimedb" -replace_placeholder_in_file "${TARGET_DIR}/.env.local" "${ROOT_DIR_PLACEHOLDER}" "${TARGET_DIR}/.spacetimedb" cat >"${TARGET_DIR}/stop.sh" <<'STOP_SCRIPT' #!/usr/bin/env bash