Skip to content

Commit f7fbe47

Browse files
committed
Revert back ci
1 parent 0fd901a commit f7fbe47

File tree

2 files changed

+22
-19
lines changed

2 files changed

+22
-19
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,19 @@ jobs:
5252
strategy:
5353
matrix:
5454
include:
55-
- name: x86_64-msvc
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
5662
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
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: {}
6068
defaults:
6169
run:
6270
shell: "${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }}"

src/ci/github-actions/ci.yml

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -351,24 +351,19 @@ jobs:
351351
strategy:
352352
matrix:
353353
include:
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
354+
- name: mingw-check
355+
<<: *job-linux-4c
361356

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

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

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

373368
auto:
374369
<<: *base-ci-job

0 commit comments

Comments
 (0)