Skip to content

Commit a80d39a

Browse files
committed
Auto merge of rust-lang#149504 - mati865:i686-pc-windows-gnullvm, r=jieyouxu
Bring back i686-pc-windows-gnullvm target rust-lang#148751 inadvertently removed i686-pc-windows-gnullvm std build when migrating to native CI runners. Since this change was not agreed upon, we should bring back prebuilt std builds for that target. There are a few runners that could do it: dist-aarch64-llvm-mingw, dist-x86_64-llvm-mingw, dist-various-1 and dist-various-2. dist-x86_64-llvm-mingw already takes slightly over 2 hours, so the faster dist-aarch64-llvm-mingw is a better choice. We can also use dist-various-x job, they don't have llvm-mingw toolchain, but it's trivial to install one.
2 parents 47cd712 + 9498f21 commit a80d39a

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

src/ci/github-actions/jobs.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -679,15 +679,18 @@ auto:
679679
CODEGEN_BACKENDS: llvm,cranelift
680680
<<: *job-windows
681681

682+
# i686 has no dedicated job, build it here because this job is fast
682683
- name: dist-aarch64-llvm-mingw
683684
env:
684685
SCRIPT: python x.py dist bootstrap --include-default-paths
685686
RUST_CONFIGURE_ARGS: >-
686687
--build=aarch64-pc-windows-gnullvm
688+
--target=aarch64-pc-windows-gnullvm,i686-pc-windows-gnullvm
687689
--enable-full-tools
688690
--enable-profiler
689691
DIST_REQUIRE_ALL_TOOLS: 1
690692
CODEGEN_BACKENDS: llvm,cranelift
693+
CC_i686_pc_windows_gnullvm: i686-w64-mingw32-clang
691694
<<: *job-windows-aarch64
692695

693696
- name: dist-x86_64-llvm-mingw

0 commit comments

Comments
 (0)