Skip to content

Commit 991ab24

Browse files
committed
ci: enble LLVM download for windows-gnu hosts
1 parent 8ac313b commit 991ab24

File tree

1 file changed

+2
-18
lines changed

1 file changed

+2
-18
lines changed

src/ci/github-actions/jobs.yml

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# dynamically in CI from ci.yml.
33
runners:
44
- &base-job
5-
env: { }
5+
env: {}
66

77
- &job-linux-4c
88
os: ubuntu-20.04
@@ -58,8 +58,7 @@ envs:
5858
NO_DEBUG_ASSERTIONS: 1
5959
NO_OVERFLOW_CHECKS: 1
6060

61-
production:
62-
&production
61+
production: &production
6362
DEPLOY_BUCKET: rust-lang-ci2
6463
# AWS_SECRET_ACCESS_KEYs are stored in GitHub's secrets storage, named
6564
# AWS_SECRET_ACCESS_KEY_<keyid>. Including the key id in the name allows to
@@ -434,28 +433,19 @@ auto:
434433
env:
435434
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
436435
SCRIPT: make ci-mingw
437-
# We are intentionally allowing an old toolchain on this builder (and that's
438-
# incompatible with LLVM downloads today).
439-
NO_DOWNLOAD_CI_LLVM: 1
440436
<<: *job-windows-8c
441437

442438
# x86_64-mingw is split into two jobs to run tests in parallel.
443439
- image: x86_64-mingw-1
444440
env:
445441
SCRIPT: make ci-mingw-x
446442
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
447-
# We are intentionally allowing an old toolchain on this builder (and that's
448-
# incompatible with LLVM downloads today).
449-
NO_DOWNLOAD_CI_LLVM: 1
450443
<<: *job-windows
451444

452445
- image: x86_64-mingw-2
453446
env:
454447
SCRIPT: make ci-mingw-bootstrap
455448
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
456-
# We are intentionally allowing an old toolchain on this builder (and that's
457-
# incompatible with LLVM downloads today).
458-
NO_DOWNLOAD_CI_LLVM: 1
459449
<<: *job-windows
460450

461451
- image: dist-x86_64-msvc
@@ -502,9 +492,6 @@ auto:
502492
RUST_CONFIGURE_ARGS: >-
503493
--build=i686-pc-windows-gnu
504494
--enable-full-tools
505-
# We are intentionally allowing an old toolchain on this builder (and that's
506-
# incompatible with LLVM downloads today).
507-
NO_DOWNLOAD_CI_LLVM: 1
508495
SCRIPT: python x.py dist bootstrap --include-default-paths
509496
DIST_REQUIRE_ALL_TOOLS: 1
510497
CODEGEN_BACKENDS: llvm,cranelift
@@ -516,9 +503,6 @@ auto:
516503
RUST_CONFIGURE_ARGS: >-
517504
--build=x86_64-pc-windows-gnu
518505
--enable-full-tools
519-
# We are intentionally allowing an old toolchain on this builder (and that's
520-
# incompatible with LLVM downloads today).
521-
NO_DOWNLOAD_CI_LLVM: 1
522506
DIST_REQUIRE_ALL_TOOLS: 1
523507
CODEGEN_BACKENDS: llvm,cranelift
524508
<<: *job-windows

0 commit comments

Comments
 (0)