WIP: DONOTMERGE

Author: Emilgardis

ci/test-docker-in-docker.sh

@@ -23,7 +23,7 @@ ci_dir=$(realpath "${ci_dir}")
 . "${ci_dir}"/shared.sh
 
 main() {
-    docker run -v "${PROJECT_HOME}":"${PROJECT_HOME}" -w "${PROJECT_HOME}" \
+    docker run --platform linux/amd64 -v "${PROJECT_HOME}":"${PROJECT_HOME}" -w "${PROJECT_HOME}" \
         --rm -e TARGET -e RUSTFLAGS -e RUST_TEST_THREADS \
         -e LLVM_PROFILE_FILE -e CARGO_INCREMENTAL \
         -e "CROSS_TARGET_${TARGET_UPPER//-/_}_IMAGE" \
@@ -56,6 +56,7 @@ cd "${td}"
 cross build --target "${TARGET}" --workspace \
     --manifest-path="./workspace/Cargo.toml" --verbose
 cd workspace
+echo -e "[target.${TARGET}]\npre-build = ["exit 0"]"
 cross build --target "${TARGET}" --workspace --verbose
 cd binary
 cross run --target "${TARGET}" --verbose

src/docker/shared.rs

@@ -196,12 +196,13 @@ 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)?;
+        metadata.target_directory = directories.target.clone();
         Ok(Self {
             mount_finder,
             metadata,