Skip to content

Commit 453c632

Browse files
committed
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).
1 parent eb7a743 commit 453c632

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
@@ -300,25 +300,21 @@ jobs:
300300
env:
301301
<<: [*shared-ci-variables, *public-variables]
302302
if: github.event_name == 'pull_request'
303-
continue-on-error: ${{ matrix.tidy }}
303+
continue-on-error: ${{ matrix.name == 'mingw-check-tidy' }}
304304
strategy:
305305
matrix:
306306
include:
307307
- name: mingw-check
308308
<<: *job-linux-16c
309-
tidy: false
310309

311310
- name: mingw-check-tidy
312311
<<: *job-linux-16c
313-
tidy: true
314312

315313
- name: x86_64-gnu-llvm-14
316314
<<: *job-linux-16c
317-
tidy: false
318315

319316
- name: x86_64-gnu-tools
320317
<<: *job-linux-16c
321-
tidy: false
322318

323319
auto:
324320
permissions:

0 commit comments

Comments
 (0)