DONOTMERGE - ci test-various and x86_64-mscv

rust-lang · Mar 9, 2024 · 0e8bd06 · 0e8bd06
1 parent d3a307e
commit 0e8bd06
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 22 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -52,19 +52,14 @@ jobs:
     strategy:
       matrix:
         include:
-          - name: mingw-check
-            os: ubuntu-20.04-4core-16gb
-            env: {}
-          - name: mingw-check-tidy
-            os: ubuntu-20.04-4core-16gb
+          - name: test-various
+            os: ubuntu-20.04-8core-32gb
             env: {}
-          - name: x86_64-gnu-llvm-16
+          - name: x86_64-msvc
             env:
-              ENABLE_GCC_CODEGEN: "1"
-            os: ubuntu-20.04-16core-64gb
-          - name: x86_64-gnu-tools
-            os: ubuntu-20.04-16core-64gb
-            env: {}
+              RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"
+              SCRIPT: make ci-msvc
+            os: windows-2019-8core-32gb
     defaults:
       run:
         shell: "${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }}"

diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
@@ -351,19 +351,14 @@ jobs:
     strategy:
       matrix:
         include:
-          - name: mingw-check
-            <<: *job-linux-4c
-
-          - name: mingw-check-tidy
-            <<: *job-linux-4c
+          - name: test-various
+            <<: *job-linux-8c
 
-          - name: x86_64-gnu-llvm-16
+          - name: x86_64-msvc
             env:
-              ENABLE_GCC_CODEGEN: "1"
-            <<: *job-linux-16c
-
-          - name: x86_64-gnu-tools
-            <<: *job-linux-16c
+              RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
+              SCRIPT: make ci-msvc
+            <<: *job-windows-8c
 
   auto:
     <<: *base-ci-job