Skip to content

Commit f7ec64e

Browse files
authored
Unrolled build for rust-lang#133266
Rollup merge of rust-lang#133266 - mati865:windows-gnu-llvm-download, r=Kobzol ci: fix explanation why LLVM download is disabled for windows-gnu Continuation of rust-lang#132781
2 parents 6dd75f0 + b20bc53 commit f7ec64e

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

src/ci/github-actions/jobs.yml

+3-12
Original file line numberDiff line numberDiff line change
@@ -525,8 +525,7 @@ auto:
525525
env:
526526
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
527527
SCRIPT: make ci-mingw
528-
# We are intentionally allowing an old toolchain on this builder (and that's
529-
# incompatible with LLVM downloads today).
528+
# There is no dist-i686-mingw-alt, so there is no prebuilt LLVM with assertions
530529
NO_DOWNLOAD_CI_LLVM: 1
531530
<<: *job-windows-25-8c
532531

@@ -535,17 +534,15 @@ auto:
535534
env:
536535
SCRIPT: make ci-mingw-x
537536
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
538-
# We are intentionally allowing an old toolchain on this builder (and that's
539-
# incompatible with LLVM downloads today).
537+
# There is no dist-x86_64-mingw-alt, so there is no prebuilt LLVM with assertions
540538
NO_DOWNLOAD_CI_LLVM: 1
541539
<<: *job-windows
542540

543541
- name: x86_64-mingw-2
544542
env:
545543
SCRIPT: make ci-mingw-bootstrap
546544
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
547-
# We are intentionally allowing an old toolchain on this builder (and that's
548-
# incompatible with LLVM downloads today).
545+
# There is no dist-x86_64-mingw-alt, so there is no prebuilt LLVM with assertions
549546
NO_DOWNLOAD_CI_LLVM: 1
550547
<<: *job-windows
551548

@@ -593,9 +590,6 @@ auto:
593590
RUST_CONFIGURE_ARGS: >-
594591
--build=i686-pc-windows-gnu
595592
--enable-full-tools
596-
# We are intentionally allowing an old toolchain on this builder (and that's
597-
# incompatible with LLVM downloads today).
598-
NO_DOWNLOAD_CI_LLVM: 1
599593
SCRIPT: python x.py dist bootstrap --include-default-paths
600594
DIST_REQUIRE_ALL_TOOLS: 1
601595
CODEGEN_BACKENDS: llvm,cranelift
@@ -607,9 +601,6 @@ auto:
607601
RUST_CONFIGURE_ARGS: >-
608602
--build=x86_64-pc-windows-gnu
609603
--enable-full-tools
610-
# We are intentionally allowing an old toolchain on this builder (and that's
611-
# incompatible with LLVM downloads today).
612-
NO_DOWNLOAD_CI_LLVM: 1
613604
DIST_REQUIRE_ALL_TOOLS: 1
614605
CODEGEN_BACKENDS: llvm,cranelift
615606
<<: *job-windows

0 commit comments

Comments
 (0)