Skip to content

Commit 7fc034e

Browse files
committed
[do not merge] run msvc/mingw jobs on try
1 parent fe75555 commit 7fc034e

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
@@ -571,10 +571,30 @@ jobs:
571571
strategy:
572572
matrix:
573573
include:
574-
- name: dist-x86_64-linux
574+
- name: x86_64-msvc
575575
env:
576-
CODEGEN_BACKENDS: "llvm,cranelift"
577-
os: ubuntu-20.04-16core-64gb
576+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"
577+
SCRIPT: make ci-msvc
578+
os: windows-2019-8core-32gb
579+
- name: i686-msvc
580+
env:
581+
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-msvc"
582+
SCRIPT: make ci-msvc
583+
os: windows-2019-8core-32gb
584+
- name: i686-mingw
585+
env:
586+
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu"
587+
SCRIPT: make ci-mingw
588+
NO_DOWNLOAD_CI_LLVM: 1
589+
CUSTOM_MINGW: 1
590+
os: windows-2019-8core-32gb
591+
- name: x86_64-mingw
592+
env:
593+
SCRIPT: make ci-mingw
594+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler"
595+
NO_DOWNLOAD_CI_LLVM: 1
596+
CUSTOM_MINGW: 1
597+
os: windows-2019-8core-32gb
578598
timeout-minutes: 600
579599
runs-on: "${{ matrix.os }}"
580600
steps:

src/ci/github-actions/ci.yml

+31-4
Original file line numberDiff line numberDiff line change
@@ -726,12 +726,39 @@ jobs:
726726
strategy:
727727
matrix:
728728
include:
729-
- &dist-x86_64-linux
730-
name: dist-x86_64-linux
729+
- name: x86_64-msvc
731730
env:
732-
CODEGEN_BACKENDS: llvm,cranelift
733-
<<: *job-linux-16c
731+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
732+
SCRIPT: make ci-msvc
733+
<<: *job-windows-8c
734+
735+
- name: i686-msvc
736+
env:
737+
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc
738+
SCRIPT: make ci-msvc
739+
<<: *job-windows-8c
734740

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

736763
master:
737764
name: master

0 commit comments

Comments
 (0)