Skip to content

Commit c4190f2

Browse files
committed
Auto merge of #111224 - jyn514:default-tidy, r=pietroalbini
Remove `tidy` key in PR CI This avoids confusing error messages when adding an `auto` job to CI (as recommended in the dev-guide: https://rustc-dev-guide.rust-lang.org/tests/ci.html#using-ci-to-test). cc https://rust-lang.zulipchat.com/#narrow/stream/182449-t-compiler.2Fhelp/topic/Do.20.60needs-profiler-support.60.20tests.20not.20run.20in.20CI.3F/near/355302998 r? `@ghost`
2 parents 613a5c9 + 453c632 commit c4190f2

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

.github/workflows/ci.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -42,24 +42,20 @@ jobs:
4242
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
4343
CACHE_DOMAIN: ci-caches.rust-lang.org
4444
if: "github.event_name == 'pull_request'"
45-
continue-on-error: "${{ matrix.tidy }}"
45+
continue-on-error: "${{ matrix.name == 'mingw-check-tidy' }}"
4646
strategy:
4747
matrix:
4848
include:
4949
- name: mingw-check
50-
tidy: false
5150
os: ubuntu-20.04-16core-64gb
5251
env: {}
5352
- name: mingw-check-tidy
54-
tidy: true
5553
os: ubuntu-20.04-16core-64gb
5654
env: {}
5755
- name: x86_64-gnu-llvm-14
58-
tidy: false
5956
os: ubuntu-20.04-16core-64gb
6057
env: {}
6158
- name: x86_64-gnu-tools
62-
tidy: false
6359
os: ubuntu-20.04-16core-64gb
6460
env: {}
6561
timeout-minutes: 600

src/ci/github-actions/ci.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -298,25 +298,21 @@ jobs:
298298
env:
299299
<<: [*shared-ci-variables, *public-variables]
300300
if: github.event_name == 'pull_request'
301-
continue-on-error: ${{ matrix.tidy }}
301+
continue-on-error: ${{ matrix.name == 'mingw-check-tidy' }}
302302
strategy:
303303
matrix:
304304
include:
305305
- name: mingw-check
306306
<<: *job-linux-16c
307-
tidy: false
308307

309308
- name: mingw-check-tidy
310309
<<: *job-linux-16c
311-
tidy: true
312310

313311
- name: x86_64-gnu-llvm-14
314312
<<: *job-linux-16c
315-
tidy: false
316313

317314
- name: x86_64-gnu-tools
318315
<<: *job-linux-16c
319-
tidy: false
320316

321317
auto:
322318
permissions:

0 commit comments

Comments
 (0)