From c69c75aefa9100cb16f17378cd79e73a65aca3d9 Mon Sep 17 00:00:00 2001
From: "google-labs-jules[bot]"
 <161369871+google-labs-jules[bot]@users.noreply.github.com>
Date: Sat, 25 Oct 2025 15:23:01 +0000
Subject: [PATCH 1/2] fix(deps): Use master branch for trivy-action

The previous commit SHA for the `aquasecurity/trivy-action` GitHub Action was invalid, causing the `build-scan-push` job to fail. This change updates the action to use the `master` branch, which should resolve the issue and ensure the latest version of the action is always used.
---
 .github/workflows/docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 4559856..53bcf0d 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -44,7 +44,7 @@ jobs:
           cache-to: type=gha,mode=max
 
       - name: Scan for vulnerabilities
-        uses: aquasecurity/trivy-action@678a23d8ab761c56f6f59508935c1054363d11b3
+        uses: aquasecurity/trivy-action@master
         with:
           image-ref: 'ghcr.io/${{ github.repository }}:${{ github.sha }}'
           format: 'table'

From 79f08f50a4c9f1fae0b946dea77a2fb930526f3c Mon Sep 17 00:00:00 2001
From: "google-labs-jules[bot]"
 <161369871+google-labs-jules[bot]@users.noreply.github.com>
Date: Sat, 25 Oct 2025 17:25:39 +0000
Subject: [PATCH 2/2] fix(deps): Use main branch for trivy-action

The previous commit SHA for the `aquasecurity/trivy-action` GitHub Action was invalid, causing the `build-scan-push` job to fail. This change updates the action to use the `main` branch, which should resolve the issue and ensure the latest version of the action is always used.
---
 .github/workflows/docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 53bcf0d..23bcaeb 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -44,7 +44,7 @@ jobs:
           cache-to: type=gha,mode=max
 
       - name: Scan for vulnerabilities
-        uses: aquasecurity/trivy-action@master
+        uses: aquasecurity/trivy-action@main
         with:
           image-ref: 'ghcr.io/${{ github.repository }}:${{ github.sha }}'
           format: 'table'