Merge #1199

1199: Bugfix: use current target_dir path when copying build artifacts back r=Emilgardis a=hulucc Closes #1103 Co-authored-by: hulucc <[email protected]> Co-authored-by: Emil Gardström <[email protected]>
cross-rs · Feb 10, 2023 · 404ee1f · 404ee1f
2 parents 80c9f91 + c2ba62c
commit 404ee1f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/.changes/1199.json b/.changes/1199.json
@@ -0,0 +1,5 @@
+{
+    "type": "fixed",
+    "description": "use current target_dir path when copying build artifacts back",
+    "issues": [1103]
+}
diff --git a/src/docker/remote.rs b/src/docker/remote.rs
@@ -954,10 +954,13 @@ symlink_recurse \"${{prefix}}\"
         .map(|s| bool_from_envvar(&s))
         .unwrap_or_default();
     bail_container_exited!();
-    if !skip_artifacts && data_volume.container_path_exists(&target_dir, mount_prefix, msg_info)? {
+    let mount_target_dir = format!("{}/{}", package_dirs.mount_root(), target_dir);
+    if !skip_artifacts
+        && data_volume.container_path_exists(&mount_target_dir, mount_prefix, msg_info)?
+    {
         subcommand_or_exit(engine, "cp")?
             .arg("-a")
-            .arg(&format!("{container_id}:{target_dir}",))
+            .arg(&format!("{container_id}:{mount_target_dir}",))
             .arg(
                 package_dirs
                     .target()