Skip to content

Commit acde17c

Browse files
committed
Fix CI: rustfmt, xtask empty TARGET_TRIPLE, and package linking
- Sort `pub mod adapters` alphabetically in ops/mod.rs - Wrap long line in volume/fs/refs.rs - Handle empty TARGET_TRIPLE env var in xtask setup - Replace `link:@spacedrive/*` with published `^0.2.3` versions
1 parent 74cb8c4 commit acde17c

7 files changed

Lines changed: 14 additions & 12 deletions

File tree

apps/mobile/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"@react-navigation/native-stack": "^7.2.0",
3030
"@sd/assets": "workspace:*",
3131
"@sd/ts-client": "workspace:*",
32-
"@spacedrive/tokens": "link:@spacedrive/tokens",
32+
"@spacedrive/tokens": "^0.2.3",
3333
"@shopify/flash-list": "2.0.2",
3434
"@tanstack/react-query": "^5.59.0",
3535
"class-variance-authority": "^0.7.1",

apps/tauri/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
},
3636
"devDependencies": {
3737
"@headlessui/tailwindcss": "^0.2.0",
38-
"@spacedrive/tokens": "link:@spacedrive/tokens",
38+
"@spacedrive/tokens": "^0.2.3",
3939
"@tailwindcss/forms": "^0.5.7",
4040
"@tailwindcss/typography": "^0.5.10",
4141
"@tailwindcss/vite": "^4.1.0",

bun.lockb

12.7 KB
Binary file not shown.

core/src/ops/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
//! - Content operations (deduplication, statistics)
99
//! - Metadata operations (hierarchical tagging)
1010
11+
pub mod adapters;
1112
pub mod addressing;
1213
pub mod config;
1314
// pub mod content;
@@ -25,7 +26,6 @@ pub mod models;
2526
pub mod network;
2627
pub mod search;
2728
pub mod sidecar;
28-
pub mod adapters;
2929
pub mod sources;
3030
pub mod spaces;
3131
pub mod sync;

core/src/volume/fs/refs.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,8 @@ impl super::FilesystemHandler for RefsHandler {
296296
}
297297

298298
fn contains_path(&self, volume: &Volume, path: &std::path::Path) -> bool {
299-
let normalized_path = crate::common::utils::strip_windows_extended_prefix(path.to_path_buf());
299+
let normalized_path =
300+
crate::common::utils::strip_windows_extended_prefix(path.to_path_buf());
300301

301302
if normalized_path.starts_with(&volume.mount_point) {
302303
return true;

packages/interface/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
"@react-three/fiber": "^9.4.2",
4040
"@sd/assets": "workspace:*",
4141
"@sd/ts-client": "workspace:*",
42-
"@spacedrive/ai": "link:@spacedrive/ai",
43-
"@spacedrive/primitives": "link:@spacedrive/primitives",
44-
"@spacedrive/tokens": "link:@spacedrive/tokens",
42+
"@spacedrive/ai": "^0.2.3",
43+
"@spacedrive/primitives": "^0.2.3",
44+
"@spacedrive/tokens": "^0.2.3",
4545
"openapi-fetch": "^0.17",
4646
"@tanstack/react-query": "^5.90.7",
4747
"@tanstack/react-query-devtools": "^5.90.2",

xtask/src/main.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,12 @@ fn setup() -> Result<()> {
128128
let project_root = find_workspace_root()?;
129129

130130
// Detect system - use TARGET_TRIPLE env var if set for cross-compilation
131-
let system = if let Ok(target_triple) = std::env::var("TARGET_TRIPLE") {
132-
println!("Using TARGET_TRIPLE from environment: {}", target_triple);
133-
system::SystemInfo::from_target_triple(&target_triple)?
134-
} else {
135-
system::SystemInfo::detect()?
131+
let system = match std::env::var("TARGET_TRIPLE") {
132+
Ok(target_triple) if !target_triple.is_empty() => {
133+
println!("Using TARGET_TRIPLE from environment: {}", target_triple);
134+
system::SystemInfo::from_target_triple(&target_triple)?
135+
}
136+
_ => system::SystemInfo::detect()?,
136137
};
137138
println!("Detected platform: {:?} {:?}", system.os, system.arch);
138139

0 commit comments

Comments
 (0)