From 5b68d81dfed1803363fed91e8fe03a4994e1d7cf Mon Sep 17 00:00:00 2001 From: Arturo Seijas Date: Tue, 24 Feb 2026 15:12:40 +0100 Subject: [PATCH 1/3] Remove charmcraftcache test --- .github/workflows/workflow_test.yaml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.github/workflows/workflow_test.yaml b/.github/workflows/workflow_test.yaml index 7279954fc..43e34b4f1 100644 --- a/.github/workflows/workflow_test.yaml +++ b/.github/workflows/workflow_test.yaml @@ -129,18 +129,6 @@ jobs: self-hosted-runner-image: noble self-hosted-runner-label: large with-uv: true - integration-charmcraftcache: - uses: ./.github/workflows/integration_test.yaml - secrets: inherit - with: - juju-channel: '3/stable' - channel: 1.34-strict/stable - provider: microk8s - charmcraftcache: true - working-directory: "tests/workflows/integration/test-upload-charm/" - trivy-image-config: "tests/workflows/integration/test-upload-charm/trivy.yaml" - trivy-severity-config: "CRITICAL,HIGH" - with-uv: true integration-alternative-rock-filename: uses: ./.github/workflows/integration_test.yaml secrets: inherit From 880602c7efe0f11f3428ae7362f2b9a1302018b4 Mon Sep 17 00:00:00 2001 From: Arturo Seijas Date: Tue, 24 Feb 2026 15:52:38 +0100 Subject: [PATCH 2/3] update trivy bin --- .github/workflows/integration_test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration_test.yaml b/.github/workflows/integration_test.yaml index 49ed68a4b..e1b6b736f 100644 --- a/.github/workflows/integration_test.yaml +++ b/.github/workflows/integration_test.yaml @@ -350,7 +350,7 @@ jobs: - name: Check trivyignore if: matrix.scan.image != '' run: | - curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin v0.65.0 + curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin v0.69.1 if [ -f ".trivyignore" ] then ignored_cves=$(trivy image "$ROCK_IMAGE" \ From 3ea99bdfb0bebe764298a65dfd492f1998444c8f Mon Sep 17 00:00:00 2001 From: Arturo Seijas Date: Tue, 24 Feb 2026 15:53:22 +0100 Subject: [PATCH 3/3] Changelog --- docs/changelog.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/changelog.md b/docs/changelog.md index ddf9b9dcf..a4b32c770 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). Each revision is versioned by the date of the revision. +## 2026-02-24 + +- Update the trivy binary to v0.69.1. + ## 2026-02-23 - Update the tag used by the steps in `docs_rtd.yaml` that call workflows in