From c376fc877c27ba185cf6acf29804c6aeff5667b5 Mon Sep 17 00:00:00 2001
From: Scott Kool <1058997+ComradeCow@users.noreply.github.com>
Date: Fri, 28 Aug 2026 11:06:09 -0500
Subject: [PATCH 1/3] Bump trivy to latest

---
 .github/workflows/CI.yml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index c4660e9f..00659e00 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -13,7 +13,7 @@ on:
     branches: [master]
   schedule:
     # run the build at midnight every night
-    - cron: '0 0 * * *'
+    - cron: "0 0 * * *"
 
 permissions:
   contents: read
@@ -30,11 +30,11 @@ jobs:
       - name: Maximize build space
         uses: AdityaGarg8/remove-unwanted-software@v5
         with:
-          remove-dotnet: 'true'
-          remove-android: 'true'
-          remove-haskell: 'true'
-          remove-codeql: 'true'
-          remove-docker-images: 'true'
+          remove-dotnet: "true"
+          remove-android: "true"
+          remove-haskell: "true"
+          remove-codeql: "true"
+          remove-docker-images: "true"
 
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v7
@@ -51,12 +51,12 @@ jobs:
 
       - name: Scan base image with Trivy
         id: trivy-base-scan
-        uses: aquasecurity/trivy-action@ed142fd0673e97e23eac54620cfb913e5ce36c25 # v0.36.0
+        uses: aquasecurity/trivy-action@d2a0b60797ff03db6132bd4e2b293f9b37081297 # v0.36.0
         with:
-          scan-type: 'image'
+          scan-type: "image"
           image-ref: base_cloudshell
-          scanners: 'vuln,config'
-          severity: 'HIGH,CRITICAL'
+          scanners: "vuln,config"
+          severity: "HIGH,CRITICAL"
 
       # Build tools dockerfile
       - name: Build the tools.Dockerfile
@@ -65,12 +65,12 @@ jobs:
 
       - name: Scan Tools image with Trivy
         id: trivy-tools-scan
-        uses: aquasecurity/trivy-action@ed142fd0673e97e23eac54620cfb913e5ce36c25 # v0.36.0
+        uses: aquasecurity/trivy-action@d2a0b60797ff03db6132bd4e2b293f9b37081297 # v0.36.0
         with:
-          scan-type: 'image'
+          scan-type: "image"
           image-ref: tools_cloudshell
-          scanners: 'vuln,config'
-          severity: 'HIGH,CRITICAL'
+          scanners: "vuln,config"
+          severity: "HIGH,CRITICAL"
 
       # Run the test cases
       - name: Run the test cases

From 1c51526b0ec98f82f5fbefebbdfa451eabe36b8a Mon Sep 17 00:00:00 2001
From: Scott Kool <1058997+ComradeCow@users.noreply.github.com>
Date: Fri, 28 Aug 2026 11:14:37 -0500
Subject: [PATCH 2/3] Extends timeout for larger tools image

---
 .github/workflows/CI.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 00659e00..70562a16 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -57,6 +57,7 @@ jobs:
           image-ref: base_cloudshell
           scanners: "vuln,config"
           severity: "HIGH,CRITICAL"
+          timeout: 10m0s
 
       # Build tools dockerfile
       - name: Build the tools.Dockerfile
@@ -71,6 +72,7 @@ jobs:
           image-ref: tools_cloudshell
           scanners: "vuln,config"
           severity: "HIGH,CRITICAL"
+          timeout: 10m0s
 
       # Run the test cases
       - name: Run the test cases

From c43acbd5e23a5ad2c2365b7968855ba11188b90e Mon Sep 17 00:00:00 2001
From: Scott Kool <1058997+ComradeCow@users.noreply.github.com>
Date: Fri, 28 Aug 2026 11:16:34 -0500
Subject: [PATCH 3/3] Remove formatting noise

---
 .github/workflows/CI.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 70562a16..e3c4e3fa 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -13,7 +13,7 @@ on:
     branches: [master]
   schedule:
     # run the build at midnight every night
-    - cron: "0 0 * * *"
+    - cron: '0 0 * * *'
 
 permissions:
   contents: read
@@ -30,11 +30,11 @@ jobs:
       - name: Maximize build space
         uses: AdityaGarg8/remove-unwanted-software@v5
         with:
-          remove-dotnet: "true"
-          remove-android: "true"
-          remove-haskell: "true"
-          remove-codeql: "true"
-          remove-docker-images: "true"
+          remove-dotnet: 'true'
+          remove-android: 'true'
+          remove-haskell: 'true'
+          remove-codeql: 'true'
+          remove-docker-images: 'true'
 
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v7
@@ -53,10 +53,10 @@ jobs:
         id: trivy-base-scan
         uses: aquasecurity/trivy-action@d2a0b60797ff03db6132bd4e2b293f9b37081297 # v0.36.0
         with:
-          scan-type: "image"
+          scan-type: 'image'
           image-ref: base_cloudshell
-          scanners: "vuln,config"
-          severity: "HIGH,CRITICAL"
+          scanners: 'vuln,config'
+          severity: 'HIGH,CRITICAL'
           timeout: 10m0s
 
       # Build tools dockerfile
@@ -68,10 +68,10 @@ jobs:
         id: trivy-tools-scan
         uses: aquasecurity/trivy-action@d2a0b60797ff03db6132bd4e2b293f9b37081297 # v0.36.0
         with:
-          scan-type: "image"
+          scan-type: 'image'
           image-ref: tools_cloudshell
-          scanners: "vuln,config"
-          severity: "HIGH,CRITICAL"
+          scanners: 'vuln,config'
+          severity: 'HIGH,CRITICAL'
           timeout: 10m0s
 
       # Run the test cases