Skip to content

Commit 0fd901a

Browse files
committed
Commit 5: Check on msvc
1 parent 7f667e3 commit 0fd901a

File tree

2 files changed

+19
-22
lines changed

2 files changed

+19
-22
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,11 @@ jobs:
5252
strategy:
5353
matrix:
5454
include:
55-
- name: mingw-check
56-
os: ubuntu-20.04-4core-16gb
57-
env: {}
58-
- name: mingw-check-tidy
59-
os: ubuntu-20.04-4core-16gb
60-
env: {}
61-
- name: x86_64-gnu-llvm-16
55+
- name: x86_64-msvc
6256
env:
63-
ENABLE_GCC_CODEGEN: "1"
64-
os: ubuntu-20.04-16core-64gb
65-
- name: x86_64-gnu-tools
66-
os: ubuntu-20.04-16core-64gb
67-
env: {}
57+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc"
58+
SCRIPT: "./x.py --stage 1 test tests/run-make/alloc-no-sync"
59+
os: windows-2019-8core-32gb
6860
defaults:
6961
run:
7062
shell: "${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }}"

src/ci/github-actions/ci.yml

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -351,19 +351,24 @@ jobs:
351351
strategy:
352352
matrix:
353353
include:
354-
- name: mingw-check
355-
<<: *job-linux-4c
354+
- name: x86_64-msvc
355+
env:
356+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
357+
SCRIPT: ./x.py --stage 1 test tests/run-make/alloc-no-sync
358+
<<: *job-windows-8c
359+
# - name: mingw-check
360+
# <<: *job-linux-4c
356361

357-
- name: mingw-check-tidy
358-
<<: *job-linux-4c
362+
# - name: mingw-check-tidy
363+
# <<: *job-linux-4c
359364

360-
- name: x86_64-gnu-llvm-16
361-
env:
362-
ENABLE_GCC_CODEGEN: "1"
363-
<<: *job-linux-16c
365+
# - name: x86_64-gnu-llvm-16
366+
# env:
367+
# ENABLE_GCC_CODEGEN: "1"
368+
# <<: *job-linux-16c
364369

365-
- name: x86_64-gnu-tools
366-
<<: *job-linux-16c
370+
# - name: x86_64-gnu-tools
371+
# <<: *job-linux-16c
367372

368373
auto:
369374
<<: *base-ci-job

0 commit comments

Comments
 (0)