From 895eb3035e2e4e9e726f5fa5523e3f2fa861583a Mon Sep 17 00:00:00 2001 From: Jakub Beránek Date: Wed, 14 Jun 2023 23:07:49 +0200 Subject: Merge `msvc-1/2` CI jobs --- src/ci/github-actions/ci.yml | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'src/ci/github-actions') diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index d3cb6b6ed52..19ead2f1b11 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -582,28 +582,16 @@ jobs: # Windows Builders # ###################### - - 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 <<: *job-windows-8c - - name: x86_64-msvc-2 - env: - RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler - SCRIPT: make ci-subset-2 - <<: *job-windows-8c - - - name: i686-msvc-1 - env: - RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc - SCRIPT: make ci-subset-1 - <<: *job-windows-8c - - - 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 <<: *job-windows-8c - name: x86_64-msvc-cargo -- cgit 1.4.1-3-g733a5