1
Fork 0

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 355302998

r? `@ghost`
This commit is contained in:
bors 2023-05-07 17:17:58 +00:00
commit c4190f2d3a
2 changed files with 2 additions and 10 deletions

View file

@ -42,24 +42,20 @@ jobs:
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate" TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
CACHE_DOMAIN: ci-caches.rust-lang.org CACHE_DOMAIN: ci-caches.rust-lang.org
if: "github.event_name == 'pull_request'" if: "github.event_name == 'pull_request'"
continue-on-error: "${{ matrix.tidy }}" continue-on-error: "${{ matrix.name == 'mingw-check-tidy' }}"
strategy: strategy:
matrix: matrix:
include: include:
- name: mingw-check - name: mingw-check
tidy: false
os: ubuntu-20.04-16core-64gb os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: mingw-check-tidy - name: mingw-check-tidy
tidy: true
os: ubuntu-20.04-16core-64gb os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: x86_64-gnu-llvm-14 - name: x86_64-gnu-llvm-14
tidy: false
os: ubuntu-20.04-16core-64gb os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: x86_64-gnu-tools - name: x86_64-gnu-tools
tidy: false
os: ubuntu-20.04-16core-64gb os: ubuntu-20.04-16core-64gb
env: {} env: {}
timeout-minutes: 600 timeout-minutes: 600

View file

@ -298,25 +298,21 @@ jobs:
env: env:
<<: [*shared-ci-variables, *public-variables] <<: [*shared-ci-variables, *public-variables]
if: github.event_name == 'pull_request' if: github.event_name == 'pull_request'
continue-on-error: ${{ matrix.tidy }} continue-on-error: ${{ matrix.name == 'mingw-check-tidy' }}
strategy: strategy:
matrix: matrix:
include: include:
- name: mingw-check - name: mingw-check
<<: *job-linux-16c <<: *job-linux-16c
tidy: false
- name: mingw-check-tidy - name: mingw-check-tidy
<<: *job-linux-16c <<: *job-linux-16c
tidy: true
- name: x86_64-gnu-llvm-14 - name: x86_64-gnu-llvm-14
<<: *job-linux-16c <<: *job-linux-16c
tidy: false
- name: x86_64-gnu-tools - name: x86_64-gnu-tools
<<: *job-linux-16c <<: *job-linux-16c
tidy: false
auto: auto:
permissions: permissions: