diff options
| author | bors <bors@rust-lang.org> | 2025-07-11 01:06:04 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-07-11 01:06:04 +0000 |
| commit | cdac44e608c3df9a241e0a1b53b3f62af250dbf1 (patch) | |
| tree | f7e355279b7866227d1019dec44e56752e73cad5 /src/ci/github-actions | |
| parent | 2a023bf80a6fbd6a06d5460a34eb247b986286ed (diff) | |
| parent | 3a1bb04166b58762d8d9a1a7d1f5a24a938891f6 (diff) | |
Auto merge of #143762 - tgross35:rollup-n9t27c6, r=tgross35
Rollup of 7 pull requests Successful merges: - rust-lang/rust#140136 (Add an aarch64-msvc build running on ARM64 Windows) - rust-lang/rust#143642 (stdarch subtree update) - rust-lang/rust#143707 (Fix `--skip-std-check-if-no-download-rustc`) - rust-lang/rust#143722 (Make some "safe" llvm ops actually sound) - rust-lang/rust#143728 (Resolve refactor: extraction of `finalize_module_binding` and `single_import_can_define_name`) - rust-lang/rust#143742 (Rework borrowing suggestions to use `Expr` instead of just `Span`) - rust-lang/rust#143744 (Properly track the depth when expanding free alias types) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/ci/github-actions')
| -rw-r--r-- | src/ci/github-actions/jobs.yml | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 01993ad28aa..445fc0dd018 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -46,6 +46,10 @@ runners: os: windows-2025-8core-32gb <<: *base-job + - &job-windows-aarch64 + os: windows-11-arm + <<: *base-job + - &job-aarch64-linux # Free some disk space to avoid running out of space during the build. free_disk: true @@ -561,6 +565,19 @@ auto: SCRIPT: make ci-msvc-ps1 <<: *job-windows + # aarch64-msvc is split into two jobs to run tests in parallel. + - name: aarch64-msvc-1 + env: + RUST_CONFIGURE_ARGS: --build=aarch64-pc-windows-msvc + SCRIPT: make ci-msvc-py + <<: *job-windows-aarch64 + + - name: aarch64-msvc-2 + env: + RUST_CONFIGURE_ARGS: --build=aarch64-pc-windows-msvc + SCRIPT: make ci-msvc-ps1 + <<: *job-windows-aarch64 + # x86_64-msvc-ext is split into multiple jobs to run tests in parallel. - name: x86_64-msvc-ext1 env: @@ -656,14 +673,14 @@ auto: - name: dist-aarch64-msvc env: RUST_CONFIGURE_ARGS: >- - --build=x86_64-pc-windows-msvc + --build=aarch64-pc-windows-msvc --host=aarch64-pc-windows-msvc --target=aarch64-pc-windows-msvc,arm64ec-pc-windows-msvc --enable-full-tools --enable-profiler SCRIPT: python x.py dist bootstrap --include-default-paths DIST_REQUIRE_ALL_TOOLS: 1 - <<: *job-windows + <<: *job-windows-aarch64 - name: dist-i686-mingw env: |