From 554c759aad8be482cf3d17c72e0d904e5b35b1d6 Mon Sep 17 00:00:00 2001
From: Fraser Tweedale <frase@frase.id.au>
Date: Mon, 6 Nov 2023 13:01:06 +1000
Subject: [PATCH] ci: don't skip check_advisories when tools change

The `check_advisories` step only runs if the tools didn't change.
If tools *and* advisories changed, it skips the  `check_advisories`
step.  This is incorrect behaviour.  Ignore the state of the tools
directory when deciding whether to run the `check_advisories` step.
---
 .github/workflows/check-advisories.yml | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/check-advisories.yml b/.github/workflows/check-advisories.yml
index 47adfe21..8ba12c73 100644
--- a/.github/workflows/check-advisories.yml
+++ b/.github/workflows/check-advisories.yml
@@ -2,19 +2,6 @@ name: Check advisories
 on:
   - pull_request
 jobs:
-  tools_changed:
-    continue-on-error: true
-    runs-on: ubuntu-22.04
-    outputs:
-      should_skip: ${{ steps.skip_check.outputs.should_skip }}
-    steps:
-      - id: skip_check
-        uses: fkirc/skip-duplicate-actions@v5.3.0
-        with:
-          concurrent_skipping: "never"
-          skip_after_successful_duplicate: "true"
-          paths: '["code/**"]'
-          do_not_skip: '["push", "workflow_dispatch", "schedule"]'
   advisories_changed:
     continue-on-error: true
     runs-on: ubuntu-22.04
@@ -52,8 +39,8 @@ jobs:
           echo "code-hash=$code_hash" >> "$GITHUB_OUTPUT"
   check_advisories:
     name: Invoke check-advisories workflow
-    needs: [tools_changed, advisories_changed, code_hash]
-    if: ${{ needs.tools_changed.outputs.should_skip == 'true' && needs.advisories_changed.outputs.should_skip != 'true' }}
+    needs: [advisories_changed, code_hash]
+    if: ${{ needs.advisories_changed.outputs.should_skip != 'true' }}
     uses: ./.github/workflows/call-check-advisories.yml
     with:
       fetch-key: hsec-tools-${{ needs.code_hash.outputs.code_hash }}