From d6e6fd5053334316dabd1f3dc130d3739f2c013b Mon Sep 17 00:00:00 2001
From: Jonathan Knight <jk@thegridman.com>
Date: Fri, 25 Oct 2024 19:07:03 +0300
Subject: [PATCH] Update Trivy GitHub workflows

---
 .github/workflows/trivy.yaml | 2 +-
 Makefile                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/trivy.yaml b/.github/workflows/trivy.yaml
index 792bc429..fbf7b035 100644
--- a/.github/workflows/trivy.yaml
+++ b/.github/workflows/trivy.yaml
@@ -87,5 +87,5 @@ jobs:
       shell: bash
       run:  |
         echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
-        export TRIVY_CACHE=$GITHUB_WORKSPACE/.cache
+        export TRIVY_CACHE=$GITHUB_WORKSPACE/.cache/trivy
         make trivy-scan
diff --git a/Makefile b/Makefile
index 8b291b8e..be6a0af8 100644
--- a/Makefile
+++ b/Makefile
@@ -1981,7 +1981,7 @@ TRIVY_CACHE ?=
 trivy-scan: build-operator-images $(TOOLS_BIN)/trivy ## Scan the Operator image using Trivy
 
 ifeq (Darwin, $(UNAME_S))
-	$(TOOLS_BIN)/trivy --cache-dir OME/Library/Caches/trivy image $(OPERATOR_IMAGE)
+	$(TOOLS_BIN)/trivy --cache-dir $(HOME)/Library/Caches/trivy image $(OPERATOR_IMAGE)
 else
 ifdef TRIVY_CACHE
 	$(TOOLS_BIN)/trivy --cache-dir $(TRIVY_CACHE) image $(OPERATOR_IMAGE)