Skip to content

Commit 1092c6d

Browse files
authored
Unrolled build for #141656
Rollup merge of #141656 - ehuss:cargo-aarch64-macos, r=marcoieni,jieyouxu CI: Add cargo tests to aarch64-apple-darwin This adds running of cargo's tests to the aarch64-apple-darwin job. The reason for this is that tier-1 targets are ostensibly supposed to run tests for host tools, but we are not doing that here. We do have fairly good coverage in Cargo's CI, but we don't cover the beta or stable branches here. I think it would be good to have a fallback here. I think this should only add about 7 minutes of CI time, but I have not measured it. The current job is about 1.5 hours. In summary of the tier-1 targets: | Target | rust-lang/cargo | rust-lang/rust | |--------|-----------------|----------------| | aarch64-apple-darwin | stable/nightly | ❌ (this PR) | | aarch64-unknown-linux-gnu | stable/nightly | ✓ | | x86_64-apple-darwin | nightly | ❌ | | x86_64-pc-windows-gnu | nightly | ❌ | | x86_64-pc-windows-msvc | stable | ✓ | | x86_64-unknown-linux-gnu | stable/beta/nightly | ✓ | | i686-pc-windows-msvc | ❌ | ❌ | | i686-unknown-linux-gnu | ❌ | ❌ | try-job: aarch64-apple
2 parents 38081f2 + d562c46 commit 1092c6d

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/ci/github-actions/jobs.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,9 @@ auto:
469469

470470
- name: aarch64-apple
471471
env:
472-
SCRIPT: ./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin
472+
SCRIPT: >
473+
./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin &&
474+
./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin src/tools/cargo
473475
RUST_CONFIGURE_ARGS: >-
474476
--enable-sanitizers
475477
--enable-profiler

0 commit comments

Comments
 (0)