Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 98650c2

Browse files
committed
[do not merge] run msvc/mingw jobs on try
1 parent 881e2c2 commit 98650c2

File tree

2 files changed

+54
-7
lines changed

2 files changed

+54
-7
lines changed

.github/workflows/ci.yml

Lines changed: 23 additions & 3 deletions
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

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

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

735762
master:
736763
name: master

0 commit comments

Comments
 (0)