Try #994: --target cross

Author: bors[bot]

.changes/994.json

@@ -0,0 +1,5 @@
+{
+    "type": "fixed",
+    "description": "fixed wrong path used for target when pre-building in container in container mode",
+    "issues": [993]
+}

ci/test-cross-image.sh

@@ -35,6 +35,17 @@ git clone --depth 1 https://github.com/cross-rs/rust-cpp-hello-word "${td}"
 cd "${td}"
 cross run --target "${TARGET}"
 '
+td="$(mkcargotemp -d)"
+git clone --depth 1 https://github.com/cross-rs/rust-cpp-hello-word "${td}"
+cd "${td}"
+echo '# Cross.toml
+[target.'${TARGET}']
+pre-build = ["exit 0"]
+' > Cross.toml
+docker run --rm -e TARGET -e CROSS_CONTAINER_IN_CONTAINER=1 -e "CROSS_TARGET_${TARGET_UPPER//-/_}_IMAGE" \
+        -v /var/run/docker.sock:/var/run/docker.sock \
+        -v $PWD:/mount -w /mount \
+        "${CROSS_TARGET_CROSS_IMAGE}" cross build --target "${TARGET}"
 }
 
 main "${@}"

ci/test-docker-in-docker.sh

@@ -23,8 +23,8 @@ ci_dir=$(realpath "${ci_dir}")
 . "${ci_dir}"/shared.sh
 
 main() {
-    docker run -v "${PROJECT_HOME}":"${PROJECT_HOME}" -w "${PROJECT_HOME}" \
-        --rm -e TARGET -e RUSTFLAGS -e RUST_TEST_THREADS \
+    docker run --platform linux/amd64 -v "${PROJECT_HOME}":"${PROJECT_HOME}" -w "${PROJECT_HOME}" \
+        --rm -e TARGET -e TARGET_UPPER -e RUSTFLAGS -e RUST_TEST_THREADS \
         -e LLVM_PROFILE_FILE -e CARGO_INCREMENTAL \
         -e "CROSS_TARGET_${TARGET_UPPER//-/_}_IMAGE" \
         -v /var/run/docker.sock:/var/run/docker.sock \
@@ -55,10 +55,14 @@ git clone --depth 1 https://github.com/cross-rs/test-workspace "${td}"
 cd "${td}"
 cross build --target "${TARGET}" --workspace \
     --manifest-path="./workspace/Cargo.toml" --verbose
+eval CROSS_TARGET_${TARGET_UPPER//-/_}_PRE_BUILD="exit" cross build --target "${TARGET}" --workspace \
+    --manifest-path="./workspace/Cargo.toml" --verbose
 cd workspace
 cross build --target "${TARGET}" --workspace --verbose
+eval CROSS_TARGET_${TARGET_UPPER//-/_}_PRE_BUILD="exit" cross build --target "${TARGET}" --workspace --verbose
 cd binary
 cross run --target "${TARGET}" --verbose
+eval CROSS_TARGET_${TARGET_UPPER//-/_}_PRE_BUILD="exit" cross run --target "${TARGET}" --verbose
 '
 }
 

src/docker/shared.rs

@@ -196,12 +196,12 @@ pub struct DockerPaths {
 impl DockerPaths {
     pub fn create(
         engine: &Engine,
-        metadata: CargoMetadata,
+        mut metadata: CargoMetadata,
         cwd: PathBuf,
         toolchain: QualifiedToolchain,
     ) -> Result<Self> {
         let mount_finder = MountFinder::create(engine)?;
-        let directories = Directories::create(&mount_finder, &metadata, &cwd, toolchain)?;
+        let directories = Directories::create(&mount_finder, &mut metadata, &cwd, toolchain)?;
         Ok(Self {
             mount_finder,
             metadata,
@@ -261,7 +261,7 @@ pub struct Directories {
 impl Directories {
     pub fn create(
         mount_finder: &MountFinder,
-        metadata: &CargoMetadata,
+        metadata: &mut CargoMetadata,
         cwd: &Path,
         mut toolchain: QualifiedToolchain,
     ) -> Result<Self> {
@@ -313,7 +313,7 @@ impl Directories {
 
         let cargo = mount_finder.find_mount_path(cargo);
         let xargo = mount_finder.find_mount_path(xargo);
-        let target = mount_finder.find_mount_path(target);
+        metadata.target_directory = mount_finder.find_mount_path(target);
 
         // root is either workspace_root, or, if we're outside the workspace root, the current directory
         let host_root = mount_finder.find_mount_path(if metadata.workspace_root.starts_with(cwd) {
@@ -335,7 +335,7 @@ impl Directories {
         Ok(Directories {
             cargo,
             xargo,
-            target,
+            target: metadata.target_directory.clone(),
             nix_store,
             host_root,
             mount_root,
@@ -423,11 +423,11 @@ pub fn get_package_info(
     toolchain: QualifiedToolchain,
     msg_info: &mut MessageInfo,
 ) -> Result<(CargoMetadata, Directories)> {
-    let metadata = cargo_metadata_with_args(None, None, msg_info)?
+    let mut metadata = cargo_metadata_with_args(None, None, msg_info)?
         .ok_or(eyre::eyre!("unable to get project metadata"))?;
     let mount_finder = MountFinder::create(engine)?;
     let cwd = std::env::current_dir()?;
-    let dirs = Directories::create(&mount_finder, &metadata, &cwd, toolchain)?;
+    let dirs = Directories::create(&mount_finder, &mut metadata, &cwd, toolchain)?;
 
     Ok((metadata, dirs))
 }
@@ -1114,7 +1114,7 @@ mod tests {
         }
 
         fn get_directories(
-            metadata: &CargoMetadata,
+            metadata: &mut CargoMetadata,
             mount_finder: &MountFinder,
         ) -> Result<Directories> {
             let cwd = get_cwd()?;
@@ -1133,8 +1133,8 @@ mod tests {
         fn test_host() -> Result<()> {
             let vars = unset_env();
             let mount_finder = MountFinder::new(vec![]);
-            let metadata = cargo_metadata(false, &mut MessageInfo::default())?;
-            let directories = get_directories(&metadata, &mount_finder)?;
+            let mut metadata = cargo_metadata(false, &mut MessageInfo::default())?;
+            let directories = get_directories(&mut metadata, &mount_finder)?;
             paths_equal(&directories.cargo, &home()?.join(".cargo"))?;
             paths_equal(&directories.xargo, &home()?.join(".xargo"))?;
             paths_equal(&directories.host_root, &metadata.workspace_root)?;
@@ -1178,8 +1178,8 @@ mod tests {
             }
 
             let mount_finder = MountFinder::create(&engine)?;
-            let metadata = cargo_metadata(true, &mut msg_info)?;
-            let directories = get_directories(&metadata, &mount_finder)?;
+            let mut metadata = cargo_metadata(true, &mut msg_info)?;
+            let directories = get_directories(&mut metadata, &mount_finder)?;
             let mount_finder = MountFinder::new(docker_read_mount_paths(&engine)?);
             let mount_path = |p| mount_finder.find_mount_path(p);