Fix linting, fix linux builds

TBD54566975 · Aug 19, 2024 · ec2b0b3 · ec2b0b3
1 parent e29e9e6
commit ec2b0b3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,7 @@ members = [
     "crates/web5_cli", 
     "crates/web5_proc_macros",
     "bindings/web5_uniffi", 
-    "bindings/web5_uniffi_wrapper",
+    "bindings/web5_uniffi_wrapper", 
 ]
 default-members = [
     "crates/web5",

diff --git a/bindings/web5_uniffi/libtargets/x86_64_unknown_linux_gnu/Dockerfile b/bindings/web5_uniffi/libtargets/x86_64_unknown_linux_gnu/Dockerfile
@@ -19,6 +19,7 @@ COPY bindings/web5_uniffi_wrapper ./bindings/web5_uniffi_wrapper
 COPY bindings/web5_uniffi ./bindings/web5_uniffi
 COPY crates/web5 ./crates/web5
 COPY crates/web5_cli ./crates/web5_cli
+COPY crates/web5_proc_macros ./crates/web5_proc_macros
 
 # Execute the build
 RUN cargo build --release --package web5_uniffi

diff --git a/bindings/web5_uniffi/libtargets/x86_64_unknown_linux_musl/Dockerfile b/bindings/web5_uniffi/libtargets/x86_64_unknown_linux_musl/Dockerfile
@@ -24,6 +24,7 @@ COPY bindings/web5_uniffi_wrapper ./bindings/web5_uniffi_wrapper
 COPY bindings/web5_uniffi ./bindings/web5_uniffi
 COPY crates/web5 ./crates/web5
 COPY crates/web5_cli ./crates/web5_cli
+COPY crates/web5_proc_macros ./crates/web5_proc_macros
 
 # Build the static lib (override the lib type)
 RUN sed -i 's/crate-type = \["cdylib"\]/crate-type = \["staticlib"\]/' bindings/web5_uniffi/Cargo.toml

diff --git a/crates/web5_proc_macros/src/lib.rs b/crates/web5_proc_macros/src/lib.rs
@@ -6,7 +6,7 @@ use std::process::Command;
 #[proc_macro]
 pub fn git_sha(_input: TokenStream) -> TokenStream {
     let output = Command::new("git")
-        .args(&["rev-parse", "--short", "HEAD"])
+        .args(["rev-parse", "--short", "HEAD"])
         .output()
         .expect("Failed to execute git command");