From ea753e819cccf573e572932fb801f9e3e6fb20d4 Mon Sep 17 00:00:00 2001 From: core Date: Sun, 26 Apr 2026 15:23:36 -0400 Subject: [PATCH] chore: continue ci/cd work 2 --- .build.yml | 4 +++- crates/unified/Cargo.toml | 6 ++++-- crates/xtask/src/unified.rs | 6 +++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.build.yml b/.build.yml index 71c5c27a3a8a170cd37d5b2d84f7a60129208341..093cfb7d4513aa2fe15b9d3f60c7889a9f3629f0 100644 --- a/.build.yml +++ b/.build.yml @@ -17,7 +17,9 @@ tasks: echo '. "$HOME/.cargo/env"' > ~/.profile source ~/.profile rustup target add wasm32-unknown-unknown - sudo apk add zlib zlib-dev sccache + sudo apk add zlib zlib-dev wget + sudo wget https://coredoes.dev/sccache -O /usr/local/bin/sccache + sudo chmod 0755 /usr/local/bin/sccache - web_client: | source ~/.profile cd starkingdoms diff --git a/crates/unified/Cargo.toml b/crates/unified/Cargo.toml index bcbf23c953583e4b90616b38f586ac40cc30d0b0..a2044be0a7d4faa75069bbc8900b8039a498198b 100644 --- a/crates/unified/Cargo.toml +++ b/crates/unified/Cargo.toml @@ -90,10 +90,12 @@ tracing-wasm = "0.2" console_error_panic_hook = "0.1" [features] -native = [ +native_dev = [ "bevy/file_watcher", "bevy/hotpatching", - "bevy/dynamic_linking", + "bevy/dynamic_linking" +] +native = [ "bevy/x11", "bevy/wayland", "dep:ctrlc" diff --git a/crates/xtask/src/unified.rs b/crates/xtask/src/unified.rs index c058b73a27113d06b48e0e116fbecf3e4ce3b537..e06c11655d334b8dc842b6e1d896d21c0823efc0 100644 --- a/crates/xtask/src/unified.rs +++ b/crates/xtask/src/unified.rs @@ -19,7 +19,7 @@ impl Task for RunServerNative { args.join(" ") }; set_current_dir(workspace_dir().join("crates/unified/")).unwrap(); - cargo(format!("run -F native -F server --package starkingdoms -- server {args}")); + cargo(format!("run -F native -F native_dev -F server --package starkingdoms -- server {args}")); } } @@ -40,7 +40,7 @@ impl Task for RunListenServerNative { args.join(" ") }; set_current_dir(workspace_dir().join("crates/unified/")).unwrap(); - cargo(format!("run -F native -F server -F client --package starkingdoms -- server {args}")); + cargo(format!("run -F native -F native_dev -F server -F client --package starkingdoms -- server {args}")); } } @@ -61,6 +61,6 @@ impl Task for RunClientNative { args.join(" ") }; set_current_dir(workspace_dir().join("crates/unified/")).unwrap(); - cargo(format!("run -F native -F client --package starkingdoms -- client {args}")); + cargo(format!("run -F native -F native_dev -F client --package starkingdoms -- client {args}")); } } \ No newline at end of file