Skip to content

Commit 404ee1f

Browse files
bors[bot]huluccEmilgardis
authored
Merge #1199
1199: Bugfix: use current target_dir path when copying build artifacts back r=Emilgardis a=hulucc Closes #1103 Co-authored-by: hulucc <hulucc@outlook.com> Co-authored-by: Emil Gardström <emil.gardstrom@gmail.com>
2 parents 80c9f91 + c2ba62c commit 404ee1f

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

.changes/1199.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"type": "fixed",
3+
"description": "use current target_dir path when copying build artifacts back",
4+
"issues": [1103]
5+
}

src/docker/remote.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -954,10 +954,13 @@ symlink_recurse \"${{prefix}}\"
954954
.map(|s| bool_from_envvar(&s))
955955
.unwrap_or_default();
956956
bail_container_exited!();
957-
if !skip_artifacts && data_volume.container_path_exists(&target_dir, mount_prefix, msg_info)? {
957+
let mount_target_dir = format!("{}/{}", package_dirs.mount_root(), target_dir);
958+
if !skip_artifacts
959+
&& data_volume.container_path_exists(&mount_target_dir, mount_prefix, msg_info)?
960+
{
958961
subcommand_or_exit(engine, "cp")?
959962
.arg("-a")
960-
.arg(&format!("{container_id}:{target_dir}",))
963+
.arg(&format!("{container_id}:{mount_target_dir}",))
961964
.arg(
962965
package_dirs
963966
.target()

0 commit comments

Comments
 (0)