Merge remote-tracking branch 'origin/main' into use_container_at_job_level

Author: anthony-nhs

.github/workflows/quality-checks.yml

@@ -182,7 +182,7 @@ jobs:
           fi
           touch trivy.yaml
       - name: Update trivy config to include dev dependencies
-        uses: mikefarah/yq@2be0094729a1006f61e8339ce9934bfb3cbb549f
+        uses: mikefarah/yq@5a7e72a743649b1b3a47d1a1d8214f3453173c51
         with:
           cmd: yq -i '.pkg.include-dev-deps = true' 'trivy.yaml'
       - name: convert python dependencies to requirements.txt

.trivyignore.yaml

@@ -13,9 +13,9 @@ vulnerabilities:
   - id: CVE-2026-0775
     statement: npm vulnerability accepted as risk - dependency of semantic-release
     expired_at: 2026-03-01
-  - id: CVE-2026-26960
-    statement: tar vulnerability accepted as risk - dependency of semantic-release
-    expired_at: 2026-03-01
   - id: CVE-2026-26996
-    statement: minimatch vulnerability accepted as risk - dependency of semantic-release
-    expired_at: 2026-04-01
+    statement: minimatch vulnerability accepted as risk
+    expired_at: 2026-06-01
+  - id: CVE-2026-26960
+    statement: tar vulnerability accepted as risk
+    expired_at: 2026-06-01