From 4f914ca088976ec3dab9858cade039fc17ce5677 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Sun, 13 Sep 2020 06:04:37 +0200 Subject: [PATCH] Only run `audit` on all casks if individual casks are not tested. (#89182) --- .github/workflows/ci.yml | 2 +- cmd/lib/generate-matrix.rb | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f046b293f6..b4f21cf03b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -95,7 +95,7 @@ jobs: brew cask audit ${{ join(matrix.audit_args, ' ') }} '${{ matrix.cask.path }}' timeout-minutes: 30 - if: always() + if: always() && !matrix.skip_audit - name: Gather cask information id: info diff --git a/cmd/lib/generate-matrix.rb b/cmd/lib/generate-matrix.rb index 3f69f5a223..829018ba2e 100755 --- a/cmd/lib/generate-matrix.rb +++ b/cmd/lib/generate-matrix.rb @@ -18,7 +18,12 @@ syntax_job = { matrix = [syntax_job] unless labels.include?("ci-syntax-only") - matrix += CiMatrix.generate(tap, labels: labels) + cask_jobs = CiMatrix.generate(tap, labels: labels) + + # If casks were changed, skip `audit` for all others. + syntax_job[:skip_audit] = true if cask_jobs.any? + + matrix += cask_jobs end puts JSON.pretty_generate(matrix)