From 453c632b230c4c9bac408fa406f20e656fccc51e Mon Sep 17 00:00:00 2001
From: jyn <github@jyn.dev>
Date: Thu, 4 May 2023 17:42:44 -0500
Subject: [PATCH] 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).
---
 .github/workflows/ci.yml     | 6 +-----
 src/ci/github-actions/ci.yml | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dcdaa06caa2..277755b2883 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -42,24 +42,20 @@ jobs:
       TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
       CACHE_DOMAIN: ci-caches.rust-lang.org
     if: "github.event_name == 'pull_request'"
-    continue-on-error: "${{ matrix.tidy }}"
+    continue-on-error: "${{ matrix.name == 'mingw-check-tidy' }}"
     strategy:
       matrix:
         include:
           - name: mingw-check
-            tidy: false
             os: ubuntu-20.04-16core-64gb
             env: {}
           - name: mingw-check-tidy
-            tidy: true
             os: ubuntu-20.04-16core-64gb
             env: {}
           - name: x86_64-gnu-llvm-14
-            tidy: false
             os: ubuntu-20.04-16core-64gb
             env: {}
           - name: x86_64-gnu-tools
-            tidy: false
             os: ubuntu-20.04-16core-64gb
             env: {}
     timeout-minutes: 600
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 5661adf6776..9d90319e93f 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -300,25 +300,21 @@ jobs:
     env:
       <<: [*shared-ci-variables, *public-variables]
     if: github.event_name == 'pull_request'
-    continue-on-error: ${{ matrix.tidy }}
+    continue-on-error: ${{ matrix.name == 'mingw-check-tidy' }}
     strategy:
       matrix:
         include:
           - name: mingw-check
             <<: *job-linux-16c
-            tidy: false
 
           - name: mingw-check-tidy
             <<: *job-linux-16c
-            tidy: true
 
           - name: x86_64-gnu-llvm-14
             <<: *job-linux-16c
-            tidy: false
 
           - name: x86_64-gnu-tools
             <<: *job-linux-16c
-            tidy: false
 
   auto:
     permissions: