Skip to content

Commit 1b25974

Browse files
committed
Start toward testing armv7-linux-androideabi
1 parent 121eb3f commit 1b25974

File tree

4 files changed

+29
-17
lines changed

4 files changed

+29
-17
lines changed

Cross.toml

+3
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,8 @@ passthrough = [
1212
"GIX_VERSION",
1313
]
1414

15+
[target.armv7-linux-androideabi]
16+
image = "cross-rs-gitoxide:armv7-linux-androideabi"
17+
1518
[target.s390x-unknown-linux-gnu]
1619
image = "cross-rs-gitoxide:s390x-unknown-linux-gnu"

etc/docker/Dockerfile.test-cross

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
ARG TARGET
2+
3+
FROM ghcr.io/cross-rs/${TARGET}:latest
4+
5+
RUN apt-get update && \
6+
apt-get install --no-install-recommends -y apt-transport-https gnupg && \
7+
release="$(sed -n 's/^VERSION_CODENAME=//p' /etc/os-release)" && \
8+
echo "deb https://ppa.launchpadcontent.net/git-core/ppa/ubuntu $release main" \
9+
>/etc/apt/sources.list.d/git-core-ubuntu-ppa.list && \
10+
apt-key adv --keyserver keyserver.ubuntu.com \
11+
--recv-keys F911AB184317630C59970973E363C90F8F1B6217 && \
12+
apt-get update && \
13+
apt-get install --no-install-recommends -y git jq && \
14+
rm -rf /var/lib/apt/lists/* && \
15+
git config --system gitoxide.imaginary.arbitraryVariable arbitraryValue

etc/docker/Dockerfile.test-cross-s390x

-13
This file was deleted.

etc/run-cross-experiment.sh

+11-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
#!/bin/sh
2-
set -ex
2+
3+
# Usage:
4+
#
5+
# etc/run-cross-experiment.sh armv7-linux-androideabi
6+
# etc/run-cross-experiment.sh s390x-unknown-linux-gnu
7+
8+
set -eux
9+
target="$1"
310

411
# Build the customized `cross` container image.
5-
docker build -t cross-rs-gitoxide:s390x-unknown-linux-gnu \
6-
- <etc/docker/Dockerfile.test-cross-s390x
12+
docker build --build-arg "TARGET=$target" -t "cross-rs-gitoxide:$target" \
13+
- <etc/docker/Dockerfile.test-cross
714

815
# Clean files that could cause tests to wrongly pass or fail.
916
cargo clean
1017
gix clean -xd -m '*generated*' -e
1118

1219
# Run the test suite.
13-
cross test --workspace --no-fail-fast --target s390x-unknown-linux-gnu \
20+
cross test --workspace --no-fail-fast --target "$target" \
1421
--no-default-features --features max-pure \
1522
-- --skip realpath::fuzzed_timeout

0 commit comments

Comments
 (0)