diff options
| author | Jakub Beránek <berykubik@gmail.com> | 2023-06-14 23:07:49 +0200 |
|---|---|---|
| committer | Jakub Beránek <berykubik@gmail.com> | 2023-06-14 23:07:49 +0200 |
| commit | 895eb3035e2e4e9e726f5fa5523e3f2fa861583a (patch) | |
| tree | 35d56ffc928975f5218a85340ed8c1d4e93816d1 /.github/workflows | |
| parent | 0b475c705f36fb3b0a63994b92f2bbd2f5865b07 (diff) | |
Merge `msvc-1/2` CI jobs
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/ci.yml | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 210ec72a11e..f87aecb6876 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -383,25 +383,15 @@ jobs: DIST_REQUIRE_ALL_TOOLS: 1 JEMALLOC_SYS_WITH_LG_PAGE: 14 os: macos-latest - - name: x86_64-msvc-1 + - name: x86_64-msvc env: RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler" - SCRIPT: make ci-subset-1 + SCRIPT: make ci-msvc os: windows-2019-8core-32gb - - name: x86_64-msvc-2 - env: - RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler" - SCRIPT: make ci-subset-2 - os: windows-2019-8core-32gb - - name: i686-msvc-1 - env: - RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-msvc" - SCRIPT: make ci-subset-1 - os: windows-2019-8core-32gb - - name: i686-msvc-2 + - name: i686-msvc env: RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-msvc" - SCRIPT: make ci-subset-2 + SCRIPT: make ci-msvc os: windows-2019-8core-32gb - name: x86_64-msvc-cargo env: |