Skip to content

Commit c57f99e

Browse files
committed
[do not merge] run msvc/mingw jobs on try
1 parent 89bd184 commit c57f99e

File tree

2 files changed

+54
-7
lines changed

2 files changed

+54
-7
lines changed

.github/workflows/ci.yml

+23-3
Original file line numberDiff line numberDiff line change
@@ -567,10 +567,30 @@ jobs:
567567
strategy:
568568
matrix:
569569
include:
570-
- name: dist-x86_64-linux
570+
- name: x86_64-msvc
571571
env:
572-
CODEGEN_BACKENDS: "llvm,cranelift"
573-
os: ubuntu-20.04-16core-64gb
572+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"
573+
SCRIPT: make ci-msvc
574+
os: windows-2019-8core-32gb
575+
- name: i686-msvc
576+
env:
577+
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-msvc"
578+
SCRIPT: make ci-msvc
579+
os: windows-2019-8core-32gb
580+
- name: i686-mingw
581+
env:
582+
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu"
583+
SCRIPT: make ci-mingw
584+
NO_DOWNLOAD_CI_LLVM: 1
585+
CUSTOM_MINGW: 1
586+
os: windows-2019-8core-32gb
587+
- name: x86_64-mingw
588+
env:
589+
SCRIPT: make ci-mingw
590+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler"
591+
NO_DOWNLOAD_CI_LLVM: 1
592+
CUSTOM_MINGW: 1
593+
os: windows-2019-8core-32gb
574594
timeout-minutes: 600
575595
runs-on: "${{ matrix.os }}"
576596
steps:

src/ci/github-actions/ci.yml

+31-4
Original file line numberDiff line numberDiff line change
@@ -724,12 +724,39 @@ jobs:
724724
strategy:
725725
matrix:
726726
include:
727-
- &dist-x86_64-linux
728-
name: dist-x86_64-linux
727+
- name: x86_64-msvc
729728
env:
730-
CODEGEN_BACKENDS: llvm,cranelift
731-
<<: *job-linux-16c
729+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
730+
SCRIPT: make ci-msvc
731+
<<: *job-windows-8c
732+
733+
- name: i686-msvc
734+
env:
735+
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc
736+
SCRIPT: make ci-msvc
737+
<<: *job-windows-8c
732738

739+
- name: i686-mingw
740+
env:
741+
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
742+
SCRIPT: make ci-mingw
743+
# We are intentionally allowing an old toolchain on this builder (and that's
744+
# incompatible with LLVM downloads today).
745+
NO_DOWNLOAD_CI_LLVM: 1
746+
CUSTOM_MINGW: 1
747+
<<: *job-windows-8c
748+
749+
- name: x86_64-mingw
750+
env:
751+
SCRIPT: make ci-mingw
752+
RUST_CONFIGURE_ARGS: >-
753+
--build=x86_64-pc-windows-gnu
754+
--enable-profiler
755+
# We are intentionally allowing an old toolchain on this builder (and that's
756+
# incompatible with LLVM downloads today).
757+
NO_DOWNLOAD_CI_LLVM: 1
758+
CUSTOM_MINGW: 1
759+
<<: *job-windows-8c
733760

734761
master:
735762
name: master

0 commit comments

Comments
 (0)