diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2025-02-02 12:31:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-02 12:31:54 +0100 |
| commit | 78794d0f88a4d48e8275b2cbaf192365cf6efd2e (patch) | |
| tree | 7214776682fd5ec5745581f09bc5126b65ee9046 /src/ci/github-actions | |
| parent | 8239a37f9c0951a037cfc51763ea52a20e71e6bd (diff) | |
| parent | b20bc53c3d0566f681ad1686ae53216f1c1bee3b (diff) | |
| download | rust-78794d0f88a4d48e8275b2cbaf192365cf6efd2e.tar.gz rust-78794d0f88a4d48e8275b2cbaf192365cf6efd2e.zip | |
Rollup merge of #133266 - mati865:windows-gnu-llvm-download, r=Kobzol
ci: fix explanation why LLVM download is disabled for windows-gnu Continuation of https://github.com/rust-lang/rust/pull/132781
Diffstat (limited to 'src/ci/github-actions')
| -rw-r--r-- | src/ci/github-actions/jobs.yml | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 37299a5a76b..2bbe3756580 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -525,8 +525,7 @@ auto: env: RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu SCRIPT: make ci-mingw - # We are intentionally allowing an old toolchain on this builder (and that's - # incompatible with LLVM downloads today). + # There is no dist-i686-mingw-alt, so there is no prebuilt LLVM with assertions NO_DOWNLOAD_CI_LLVM: 1 <<: *job-windows-25-8c @@ -535,8 +534,7 @@ auto: env: SCRIPT: make ci-mingw-x RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu - # We are intentionally allowing an old toolchain on this builder (and that's - # incompatible with LLVM downloads today). + # There is no dist-x86_64-mingw-alt, so there is no prebuilt LLVM with assertions NO_DOWNLOAD_CI_LLVM: 1 <<: *job-windows @@ -544,8 +542,7 @@ auto: env: SCRIPT: make ci-mingw-bootstrap RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu - # We are intentionally allowing an old toolchain on this builder (and that's - # incompatible with LLVM downloads today). + # There is no dist-x86_64-mingw-alt, so there is no prebuilt LLVM with assertions NO_DOWNLOAD_CI_LLVM: 1 <<: *job-windows @@ -593,9 +590,6 @@ auto: RUST_CONFIGURE_ARGS: >- --build=i686-pc-windows-gnu --enable-full-tools - # We are intentionally allowing an old toolchain on this builder (and that's - # incompatible with LLVM downloads today). - NO_DOWNLOAD_CI_LLVM: 1 SCRIPT: python x.py dist bootstrap --include-default-paths DIST_REQUIRE_ALL_TOOLS: 1 CODEGEN_BACKENDS: llvm,cranelift @@ -607,9 +601,6 @@ auto: RUST_CONFIGURE_ARGS: >- --build=x86_64-pc-windows-gnu --enable-full-tools - # We are intentionally allowing an old toolchain on this builder (and that's - # incompatible with LLVM downloads today). - NO_DOWNLOAD_CI_LLVM: 1 DIST_REQUIRE_ALL_TOOLS: 1 CODEGEN_BACKENDS: llvm,cranelift <<: *job-windows |