Skip to content

Commit 630f2de

Browse files
committed
Keep the cross test config from affecting other cross usage
Since we also use `cross` to build some of the releases.
1 parent 6a65693 commit 630f2de

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

Cross.toml renamed to etc/docker/test-cross.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# `cross` configuration for running tests. Treated like `Cross.toml` if enabled
2+
# with `CROSS_CONFIG=etc/docker/test-cross.toml`. This avoids affecting other
3+
# `cross` usage, e.g. in `release.yml`. See `cross-test` recipes in `justfile`.
4+
15
[build.env]
26
passthrough = [
37
"CI",

justfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,8 @@ cross-image target:
228228

229229
# Test another platform with `cross`
230230
cross-test target: (cross-image target)
231-
NO_PRELOAD_CXX=1 cross test --workspace --no-fail-fast --target "{{ target }}" \
231+
CROSS_CONFIG=etc/docker/test-cross.toml NO_PRELOAD_CXX=1 \
232+
cross test --workspace --no-fail-fast --target "{{ target }}" \
232233
--no-default-features --features max-pure \
233234
-- --skip realpath::fuzzed_timeout
234235

0 commit comments

Comments
 (0)