fix: Incorrect cross usage predicate

eclipse-zenoh · Apr 3, 2024 · 0cbb0a8 · 0cbb0a8
1 parent 05bc47a
commit 0cbb0a8
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/dist/build-crates-debian-main.js b/dist/build-crates-debian-main.js
@@ -128405,7 +128405,7 @@ async function build(path, target) {
     const crossContents = await fs.readFile(join(path, "Cross.toml"), "utf-8");
     const crossManifest = toml.parse(crossContents);
     sh(`rustup target add ${target}`, { cwd: path });
-    const command = target in crossManifest ? ["cross"] : ["cargo"];
+    const command = target in crossManifest.target ? ["cross"] : ["cargo"];
     command.push("build", "--release", "--bins", "--lib", "--target", target);
     sh(command.join(" "), { cwd: path });
 }

diff --git a/dist/build-crates-standalone-main.js b/dist/build-crates-standalone-main.js
@@ -128404,7 +128404,7 @@ async function build(path, target) {
     const crossContents = await promises_.readFile((0,external_path_.join)(path, "Cross.toml"), "utf-8");
     const crossManifest = parse(crossContents);
     command_sh(`rustup target add ${target}`, { cwd: path });
-    const command = target in crossManifest ? ["cross"] : ["cargo"];
+    const command = target in crossManifest.target ? ["cross"] : ["cargo"];
     command.push("build", "--release", "--bins", "--lib", "--target", target);
     command_sh(command.join(" "), { cwd: path });
 }

diff --git a/dist/bump-crates-main.js b/dist/bump-crates-main.js
@@ -82263,7 +82263,7 @@ async function build(path, target) {
     const crossContents = await fs.readFile(join(path, "Cross.toml"), "utf-8");
     const crossManifest = toml.parse(crossContents);
     sh(`rustup target add ${target}`, { cwd: path });
-    const command = target in crossManifest ? ["cross"] : ["cargo"];
+    const command = target in crossManifest.target ? ["cross"] : ["cargo"];
     command.push("build", "--release", "--bins", "--lib", "--target", target);
     sh(command.join(" "), { cwd: path });
 }

diff --git a/dist/publish-crates-cargo-main.js b/dist/publish-crates-cargo-main.js
@@ -82263,7 +82263,7 @@ async function build(path, target) {
     const crossContents = await fs.readFile(join(path, "Cross.toml"), "utf-8");
     const crossManifest = toml.parse(crossContents);
     sh(`rustup target add ${target}`, { cwd: path });
-    const command = target in crossManifest ? ["cross"] : ["cargo"];
+    const command = target in crossManifest.target ? ["cross"] : ["cargo"];
     command.push("build", "--release", "--bins", "--lib", "--target", target);
     sh(command.join(" "), { cwd: path });
 }

diff --git a/dist/publish-crates-debian-main.js b/dist/publish-crates-debian-main.js
@@ -128427,7 +128427,7 @@ async function build(path, target) {
     const crossContents = await fs.readFile(join(path, "Cross.toml"), "utf-8");
     const crossManifest = toml.parse(crossContents);
     sh(`rustup target add ${target}`, { cwd: path });
-    const command = target in crossManifest ? ["cross"] : ["cargo"];
+    const command = target in crossManifest.target ? ["cross"] : ["cargo"];
     command.push("build", "--release", "--bins", "--lib", "--target", target);
     sh(command.join(" "), { cwd: path });
 }

diff --git a/dist/publish-crates-eclipse-main.js b/dist/publish-crates-eclipse-main.js
@@ -128424,7 +128424,7 @@ async function build(path, target) {
     const crossContents = await fs.readFile(join(path, "Cross.toml"), "utf-8");
     const crossManifest = toml.parse(crossContents);
     sh(`rustup target add ${target}`, { cwd: path });
-    const command = target in crossManifest ? ["cross"] : ["cargo"];
+    const command = target in crossManifest.target ? ["cross"] : ["cargo"];
     command.push("build", "--release", "--bins", "--lib", "--target", target);
     sh(command.join(" "), { cwd: path });
 }

diff --git a/dist/publish-crates-github-main.js b/dist/publish-crates-github-main.js
@@ -128405,7 +128405,7 @@ async function build(path, target) {
     const crossContents = await fs.readFile(join(path, "Cross.toml"), "utf-8");
     const crossManifest = toml.parse(crossContents);
     sh(`rustup target add ${target}`, { cwd: path });
-    const command = target in crossManifest ? ["cross"] : ["cargo"];
+    const command = target in crossManifest.target ? ["cross"] : ["cargo"];
     command.push("build", "--release", "--bins", "--lib", "--target", target);
     sh(command.join(" "), { cwd: path });
 }

diff --git a/dist/publish-crates-homebrew-main.js b/dist/publish-crates-homebrew-main.js
@@ -128426,7 +128426,7 @@ async function build(path, target) {
     const crossContents = await fs.readFile(join(path, "Cross.toml"), "utf-8");
     const crossManifest = toml.parse(crossContents);
     sh(`rustup target add ${target}`, { cwd: path });
-    const command = target in crossManifest ? ["cross"] : ["cargo"];
+    const command = target in crossManifest.target ? ["cross"] : ["cargo"];
     command.push("build", "--release", "--bins", "--lib", "--target", target);
     sh(command.join(" "), { cwd: path });
 }

diff --git a/src/cargo.ts b/src/cargo.ts
@@ -310,7 +310,7 @@ export async function build(path: string, target: string) {
 
   sh(`rustup target add ${target}`, { cwd: path });
 
-  const command = target in crossManifest ? ["cross"] : ["cargo"];
+  const command = target in crossManifest.target ? ["cross"] : ["cargo"];
   command.push("build", "--release", "--bins", "--lib", "--target", target);
   sh(command.join(" "), { cwd: path });
 }