jerry/buzz
1
0
Fork 0
mirror of https://github.com/block/buzz.git synced 2026-11-02 23:41:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(justfile): complete buzz rename in dev and staging recipes (#966)

Browse Source 
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Taylor Ho
2026-06-11 01:06:29 -07:00
committed by GitHub
parent d99ad131f1
commit 31b0665cff
4 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
desktop/src-tauri/build.rs
View File

@@ -1,18 +1,18 @@
fn main() { fn main() {
println!("cargo:rerun-if-env-changed=SPROUT_RELAY_URL"); println!("cargo:rerun-if-env-changed=BUZZ_RELAY_URL");
println!("cargo:rerun-if-env-changed=SPROUT_RELAY_HTTP"); println!("cargo:rerun-if-env-changed=BUZZ_RELAY_HTTP");
println!("cargo:rerun-if-env-changed=SPROUT_UPDATER_PUBLIC_KEY"); println!("cargo:rerun-if-env-changed=SPROUT_UPDATER_PUBLIC_KEY");
println!("cargo:rerun-if-env-changed=SPROUT_UPDATER_ENDPOINT"); println!("cargo:rerun-if-env-changed=SPROUT_UPDATER_ENDPOINT");
println!("cargo:rerun-if-env-changed=SPROUT_BUILD_DATABRICKS_HOST"); println!("cargo:rerun-if-env-changed=SPROUT_BUILD_DATABRICKS_HOST");
println!("cargo:rerun-if-env-changed=SPROUT_BUILD_DATABRICKS_MODEL"); println!("cargo:rerun-if-env-changed=SPROUT_BUILD_DATABRICKS_MODEL");
println!("cargo:rustc-check-cfg=cfg(sprout_updater_enabled)"); println!("cargo:rustc-check-cfg=cfg(sprout_updater_enabled)");
if let Ok(relay_url) = std::env::var("SPROUT_RELAY_URL") { if let Ok(relay_url) = std::env::var("BUZZ_RELAY_URL") {
println!("cargo:rustc-env=SPROUT_DESKTOP_BUILD_RELAY_URL={relay_url}"); println!("cargo:rustc-env=BUZZ_DESKTOP_BUILD_RELAY_URL={relay_url}");
} }
if let Ok(relay_http) = std::env::var("SPROUT_RELAY_HTTP") { if let Ok(relay_http) = std::env::var("BUZZ_RELAY_HTTP") {
println!("cargo:rustc-env=SPROUT_DESKTOP_BUILD_RELAY_HTTP={relay_http}"); println!("cargo:rustc-env=BUZZ_DESKTOP_BUILD_RELAY_HTTP={relay_http}");
} }
if let Ok(host) = std::env::var("SPROUT_BUILD_DATABRICKS_HOST") { if let Ok(host) = std::env::var("SPROUT_BUILD_DATABRICKS_HOST") {

8
desktop/src-tauri/src/relay.rs
View File

@@ -19,8 +19,8 @@ fn configured_env_var(name: &str) -> Option<String> {
} }
pub fn relay_ws_url() -> String { pub fn relay_ws_url() -> String {
configured_env_var("SPROUT_RELAY_URL") configured_env_var("BUZZ_RELAY_URL")
.or_else(|| option_env!("SPROUT_DESKTOP_BUILD_RELAY_URL").map(str::to_string)) .or_else(|| option_env!("BUZZ_DESKTOP_BUILD_RELAY_URL").map(str::to_string))
.unwrap_or_else(|| DEFAULT_RELAY_WS_URL.to_string()) .unwrap_or_else(|| DEFAULT_RELAY_WS_URL.to_string())
} }
@@ -64,11 +64,11 @@ pub fn relay_http_base_url(relay_url: &str) -> String {
} }
pub fn relay_api_base_url() -> String { pub fn relay_api_base_url() -> String {
if let Some(base) = configured_env_var("SPROUT_RELAY_HTTP") { if let Some(base) = configured_env_var("BUZZ_RELAY_HTTP") {
return base.trim_end_matches('/').to_string(); return base.trim_end_matches('/').to_string();
} }
if let Some(base) = option_env!("SPROUT_DESKTOP_BUILD_RELAY_HTTP") { if let Some(base) = option_env!("BUZZ_DESKTOP_BUILD_RELAY_HTTP") {
return base.trim().trim_end_matches('/').to_string(); return base.trim().trim_end_matches('/').to_string();
} }

8
desktop/src-tauri/tauri.conf.json
View File

@@ -51,11 +51,11 @@
"active": true, "active": true,
"targets": "all", "targets": "all",
"externalBin": [ "externalBin": [
"binaries/sprout-acp", "binaries/buzz-acp",
"binaries/sprout-agent", "binaries/buzz-agent",
"binaries/sprout-dev-mcp", "binaries/buzz-dev-mcp",
"binaries/git-credential-nostr", "binaries/git-credential-nostr",
"binaries/sprout" "binaries/buzz"
], ],
"icon": [ "icon": [
"icons/32x32.png", "icons/32x32.png",

26
justfile
View File

@@ -174,11 +174,11 @@ desktop-release-build target="aarch64-apple-darwin":
set -euo pipefail set -euo pipefail
TARGET={{target}} TARGET={{target}}
mkdir -p desktop/src-tauri/binaries mkdir -p desktop/src-tauri/binaries
touch "desktop/src-tauri/binaries/sprout-acp-$TARGET" touch "desktop/src-tauri/binaries/buzz-acp-$TARGET"
touch "desktop/src-tauri/binaries/sprout-agent-$TARGET" touch "desktop/src-tauri/binaries/buzz-agent-$TARGET"
touch "desktop/src-tauri/binaries/sprout-dev-mcp-$TARGET" touch "desktop/src-tauri/binaries/buzz-dev-mcp-$TARGET"
touch "desktop/src-tauri/binaries/git-credential-nostr-$TARGET" touch "desktop/src-tauri/binaries/git-credential-nostr-$TARGET"
touch "desktop/src-tauri/binaries/sprout-$TARGET" touch "desktop/src-tauri/binaries/buzz-$TARGET"
pnpm install pnpm install
cd {{desktop_dir}} && pnpm tauri build --features mesh-llm --target {{target}} cd {{desktop_dir}} && pnpm tauri build --features mesh-llm --target {{target}}
@@ -279,10 +279,10 @@ dev *ARGS: _ensure-sidecar-stubs
source ../scripts/instance-env.sh source ../scripts/instance-env.sh
# Ctrl+C kills the Tauri app before its in-process sweep finishes, leaking # Ctrl+C kills the Tauri app before its in-process sweep finishes, leaking
# agent workers. Reap this instance's agents on exit as a backstop. # agent workers. Reap this instance's agents on exit as a backstop.
INSTANCE_ID=$(node -e "console.log(JSON.parse(process.env.SPROUT_TAURI_CONFIG).identifier)") INSTANCE_ID=$(node -e "console.log(JSON.parse(process.env.BUZZ_TAURI_CONFIG).identifier)")
trap '../scripts/cleanup-instance-agents.sh "$INSTANCE_ID"' EXIT trap '../scripts/cleanup-instance-agents.sh "$INSTANCE_ID"' EXIT
echo "Starting on Vite port ${SPROUT_VITE_PORT}, relay ${SPROUT_RELAY_URL}" echo "Starting on Vite port ${BUZZ_VITE_PORT}, relay ${BUZZ_RELAY_URL}"
pnpm exec tauri dev --features mesh-llm --config "$SPROUT_TAURI_CONFIG" {{ARGS}} pnpm exec tauri dev --features mesh-llm --config "$BUZZ_TAURI_CONFIG" {{ARGS}}
# Run the desktop app against the internal staging relay (installs deps + builds agent tools automatically) # Run the desktop app against the internal staging relay (installs deps + builds agent tools automatically)
staging *ARGS: _ensure-sidecar-stubs staging *ARGS: _ensure-sidecar-stubs
@@ -293,17 +293,17 @@ staging *ARGS: _ensure-sidecar-stubs
export MESH_LLM_NATIVE_RUNTIME_CACHE_DIR="$(./scripts/ensure-mesh-native-runtime.sh)" export MESH_LLM_NATIVE_RUNTIME_CACHE_DIR="$(./scripts/ensure-mesh-native-runtime.sh)"
# Replace the 0-byte sidecar stub with the real CLI binary so tauri dev picks it up. # Replace the 0-byte sidecar stub with the real CLI binary so tauri dev picks it up.
TARGET=$(rustc -vV | sed -n 's|host: ||p') TARGET=$(rustc -vV | sed -n 's|host: ||p')
cp target/release/buzz "desktop/src-tauri/binaries/sprout-${TARGET}" cp target/release/buzz "desktop/src-tauri/binaries/buzz-${TARGET}"
chmod +x "desktop/src-tauri/binaries/sprout-${TARGET}" chmod +x "desktop/src-tauri/binaries/buzz-${TARGET}"
cd {{desktop_dir}} cd {{desktop_dir}}
source ../scripts/instance-env.sh source ../scripts/instance-env.sh
export SPROUT_RELAY_URL="wss://sprout-oss.stage.blox.sqprod.co" export BUZZ_RELAY_URL="wss://sprout-oss.stage.blox.sqprod.co"
# Ctrl+C kills the Tauri app before its in-process sweep finishes, leaking # Ctrl+C kills the Tauri app before its in-process sweep finishes, leaking
# agent workers. Reap this instance's agents on exit as a backstop. # agent workers. Reap this instance's agents on exit as a backstop.
INSTANCE_ID=$(node -e "console.log(JSON.parse(process.env.SPROUT_TAURI_CONFIG).identifier)") INSTANCE_ID=$(node -e "console.log(JSON.parse(process.env.BUZZ_TAURI_CONFIG).identifier)")
trap '../scripts/cleanup-instance-agents.sh "$INSTANCE_ID"' EXIT trap '../scripts/cleanup-instance-agents.sh "$INSTANCE_ID"' EXIT
echo "Starting staging on Vite port ${SPROUT_VITE_PORT}, relay ${SPROUT_RELAY_URL}" echo "Starting staging on Vite port ${BUZZ_VITE_PORT}, relay ${BUZZ_RELAY_URL}"
pnpm exec tauri dev --features mesh-llm --config "$SPROUT_TAURI_CONFIG" {{ARGS}} pnpm exec tauri dev --features mesh-llm --config "$BUZZ_TAURI_CONFIG" {{ARGS}}
# Run the desktop frontend dev server (port derived from worktree) # Run the desktop frontend dev server (port derived from worktree)
desktop-dev: desktop-dev: