Skip to content

Commit bd81c0d

Browse files
committed
Allow old toolchain on images with CUSTOM_MINGW
1 parent b2f247e commit bd81c0d

File tree

2 files changed

+30
-12
lines changed

2 files changed

+30
-12
lines changed

.github/workflows/ci.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -389,26 +389,26 @@ jobs:
389389
os: windows-latest-xl
390390
- name: i686-mingw-1
391391
env:
392-
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu"
392+
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu --set llvm.allow-old-toolchain"
393393
SCRIPT: make ci-mingw-subset-1
394394
CUSTOM_MINGW: 1
395395
os: windows-latest-xl
396396
- name: i686-mingw-2
397397
env:
398-
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu"
398+
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu --set llvm.allow-old-toolchain"
399399
SCRIPT: make ci-mingw-subset-2
400400
CUSTOM_MINGW: 1
401401
os: windows-latest-xl
402402
- name: x86_64-mingw-1
403403
env:
404404
SCRIPT: make ci-mingw-subset-1
405-
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler"
405+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler --set llvm.allow-old-toolchain"
406406
CUSTOM_MINGW: 1
407407
os: windows-latest-xl
408408
- name: x86_64-mingw-2
409409
env:
410410
SCRIPT: make ci-mingw-subset-2
411-
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler"
411+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler --set llvm.allow-old-toolchain"
412412
CUSTOM_MINGW: 1
413413
os: windows-latest-xl
414414
- name: dist-x86_64-msvc
@@ -432,15 +432,15 @@ jobs:
432432
os: windows-latest-xl
433433
- name: dist-i686-mingw
434434
env:
435-
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu --enable-full-tools --enable-profiler"
435+
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu --enable-full-tools --enable-profiler --set llvm.allow-old-toolchain"
436436
SCRIPT: python x.py dist
437437
CUSTOM_MINGW: 1
438438
DIST_REQUIRE_ALL_TOOLS: 1
439439
os: windows-latest-xl
440440
- name: dist-x86_64-mingw
441441
env:
442442
SCRIPT: python x.py dist
443-
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler"
443+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler --set llvm.allow-old-toolchain"
444444
CUSTOM_MINGW: 1
445445
DIST_REQUIRE_ALL_TOOLS: 1
446446
os: windows-latest-xl

src/ci/github-actions/ci.yml

+24-6
Original file line numberDiff line numberDiff line change
@@ -596,29 +596,39 @@ jobs:
596596

597597
- name: i686-mingw-1
598598
env:
599-
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
599+
RUST_CONFIGURE_ARGS: >-
600+
--build=i686-pc-windows-gnu
601+
--set llvm.allow-old-toolchain
600602
SCRIPT: make ci-mingw-subset-1
601603
CUSTOM_MINGW: 1
602604
<<: *job-windows-xl
603605

604606
- name: i686-mingw-2
605607
env:
606-
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
608+
RUST_CONFIGURE_ARGS: >-
609+
--build=i686-pc-windows-gnu
610+
--set llvm.allow-old-toolchain
607611
SCRIPT: make ci-mingw-subset-2
608612
CUSTOM_MINGW: 1
609613
<<: *job-windows-xl
610614

611615
- name: x86_64-mingw-1
612616
env:
613617
SCRIPT: make ci-mingw-subset-1
614-
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-profiler
618+
RUST_CONFIGURE_ARGS: >-
619+
--build=x86_64-pc-windows-gnu
620+
--enable-profiler
621+
--set llvm.allow-old-toolchain
615622
CUSTOM_MINGW: 1
616623
<<: *job-windows-xl
617624

618625
- name: x86_64-mingw-2
619626
env:
620627
SCRIPT: make ci-mingw-subset-2
621-
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-profiler
628+
RUST_CONFIGURE_ARGS: >-
629+
--build=x86_64-pc-windows-gnu
630+
--enable-profiler
631+
--set llvm.allow-old-toolchain
622632
CUSTOM_MINGW: 1
623633
<<: *job-windows-xl
624634

@@ -663,7 +673,11 @@ jobs:
663673

664674
- name: dist-i686-mingw
665675
env:
666-
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-full-tools --enable-profiler
676+
RUST_CONFIGURE_ARGS: >-
677+
--build=i686-pc-windows-gnu
678+
--enable-full-tools
679+
--enable-profiler
680+
--set llvm.allow-old-toolchain
667681
SCRIPT: python x.py dist
668682
CUSTOM_MINGW: 1
669683
DIST_REQUIRE_ALL_TOOLS: 1
@@ -672,7 +686,11 @@ jobs:
672686
- name: dist-x86_64-mingw
673687
env:
674688
SCRIPT: python x.py dist
675-
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler
689+
RUST_CONFIGURE_ARGS: >-
690+
--build=x86_64-pc-windows-gnu
691+
--enable-full-tools
692+
--enable-profiler
693+
--set llvm.allow-old-toolchain
676694
CUSTOM_MINGW: 1
677695
DIST_REQUIRE_ALL_TOOLS: 1
678696
<<: *job-windows-xl

0 commit comments

Comments
 (0)