diff options
| author | jyn <github@jyn.dev> | 2023-05-04 17:42:44 -0500 |
|---|---|---|
| committer | jyn <github@jyn.dev> | 2023-05-04 18:17:46 -0500 |
| commit | 453c632b230c4c9bac408fa406f20e656fccc51e (patch) | |
| tree | 28d52d4ae61db32ea91b5caa29192085b98c2e3f | |
| parent | eb7a7434215dd9d4b7cc18746ad1d0e531c25325 (diff) | |
| download | rust-453c632b230c4c9bac408fa406f20e656fccc51e.tar.gz rust-453c632b230c4c9bac408fa406f20e656fccc51e.zip | |
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).
| -rw-r--r-- | .github/workflows/ci.yml | 6 | ||||
| -rw-r--r-- | 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: |