fix build function

fluent-ci-templates · Mar 15, 2024 · d756e40 · d756e40
1 parent 93340fe
commit d756e40
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/deno.json b/deno.json
@@ -1,6 +1,6 @@
 {
   "name": "@fluentci/rust",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "exports": "./mod.ts",
   "importMap": "import_map.json",
   "tasks": {

diff --git a/example/.fluentci/src/dagger/jobs.ts b/example/.fluentci/src/dagger/jobs.ts
@@ -3,7 +3,7 @@
  * @description This module provides a set of functions to build, test, and run clippy on a Rust project 🦀
  */
 
-import { dag, Directory, DirectoryID, File } from "../../sdk/client.gen.ts";
+import { dag, env, Directory, DirectoryID, File } from "../../deps.ts";
 
 export enum Job {
   clippy = "clippy",
@@ -185,13 +185,13 @@ export async function build(
     .withMountedCache("/app/target", dag.cacheVolume("target"))
     .withMountedCache("/root/cargo/registry", dag.cacheVolume("registry"))
     .withExec(
-      packageName
+      env.has("PACKAGE_NAME") || packageName
         ? [
             "cargo",
             "build",
             "--release",
             "-p",
-            packageName,
+            env.get("PACKAGE_NAME") || packageName!,
             "--target",
             target,
             ...options,
@@ -203,6 +203,7 @@ export async function build(
   const result = await ctr.stdout();
 
   console.log(result);
+  await ctr.directory(`/${target}`).export("./target");
   return ctr.directory(`/${target}`).id();
 }
 

diff --git a/src/dagger/jobs.ts b/src/dagger/jobs.ts
@@ -3,7 +3,7 @@
  * @description This module provides a set of functions to build, test, and run clippy on a Rust project 🦀
  */
 
-import { dag, Directory, DirectoryID, File } from "../../sdk/client.gen.ts";
+import { dag, env, Directory, DirectoryID, File } from "../../deps.ts";
 
 export enum Job {
   clippy = "clippy",
@@ -185,13 +185,13 @@ export async function build(
     .withMountedCache("/app/target", dag.cacheVolume("target"))
     .withMountedCache("/root/cargo/registry", dag.cacheVolume("registry"))
     .withExec(
-      packageName
+      env.has("PACKAGE_NAME") || packageName
         ? [
             "cargo",
             "build",
             "--release",
             "-p",
-            packageName,
+            env.get("PACKAGE_NAME") || packageName!,
             "--target",
             target,
             ...options,
@@ -203,6 +203,7 @@ export async function build(
   const result = await ctr.stdout();
 
   console.log(result);
+  await ctr.directory(`/${target}`).export("./target");
   return ctr.directory(`/${target}`).id();
 }