Skip to content

Commit ac22a53

Browse files
authored
Try #994: --target x86_64-unknown-linux-gnu
2 parents 7b04b6d + e225eae commit ac22a53

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

ci/test-cross-image.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,17 @@ git clone --depth 1 https://github.com/cross-rs/rust-cpp-hello-word "${td}"
3535
cd "${td}"
3636
cross run --target "${TARGET}"
3737
'
38+
td="$(mkcargotemp -d)"
39+
git clone --depth 1 https://github.com/cross-rs/rust-cpp-hello-word "${td}"
40+
echo '# Cross.toml
41+
[target.'${TARGET}']
42+
pre-build = ["exit 0"]
43+
' > Cross.toml
44+
cd "${td}"
45+
docker run --rm -e TARGET -e CROSS_CONTAINER_IN_CONTAINER=1 -e "CROSS_TARGET_${TARGET_UPPER//-/_}_IMAGE" \
46+
-v /var/run/docker.sock:/var/run/docker.sock \
47+
-v .:/mount -w /mount
48+
"${CROSS_TARGET_CROSS_IMAGE}" cross build
3849
}
3950

4051
main "${@}"

ci/test-docker-in-docker.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ci_dir=$(realpath "${ci_dir}")
2323
. "${ci_dir}"/shared.sh
2424

2525
main() {
26-
docker run -v "${PROJECT_HOME}":"${PROJECT_HOME}" -w "${PROJECT_HOME}" \
26+
docker run --platform linux/amd64 -v "${PROJECT_HOME}":"${PROJECT_HOME}" -w "${PROJECT_HOME}" \
2727
--rm -e TARGET -e RUSTFLAGS -e RUST_TEST_THREADS \
2828
-e LLVM_PROFILE_FILE -e CARGO_INCREMENTAL \
2929
-e "CROSS_TARGET_${TARGET_UPPER//-/_}_IMAGE" \
@@ -55,10 +55,14 @@ git clone --depth 1 https://github.com/cross-rs/test-workspace "${td}"
5555
cd "${td}"
5656
cross build --target "${TARGET}" --workspace \
5757
--manifest-path="./workspace/Cargo.toml" --verbose
58+
CROSS_TARGET_X86_64_UNKNOWN_LINUX_GNU_PRE_BUILD="echo 1" cross build --target "${TARGET}" --workspace \
59+
--manifest-path="./workspace/Cargo.toml" --verbose
5860
cd workspace
5961
cross build --target "${TARGET}" --workspace --verbose
62+
CROSS_TARGET_X86_64_UNKNOWN_LINUX_GNU_PRE_BUILD="echo 1" cross build --target "${TARGET}" --workspace --verbose
6063
cd binary
6164
cross run --target "${TARGET}" --verbose
65+
CROSS_TARGET_X86_64_UNKNOWN_LINUX_GNU_PRE_BUILD="echo 1" cross run --target "${TARGET}" --verbose
6266
'
6367
}
6468

0 commit comments

Comments
 (0)