From 3b8b20fb23289abb1b495eef1445a87a6dadb818 Mon Sep 17 00:00:00 2001 From: jamesthompson26-nhs Date: Tue, 13 Jan 2026 12:57:28 +0000 Subject: [PATCH] CCM-13883: Trivy Optimisation --- .github/actions/trivy-iac/action.yaml | 3 ++- .github/actions/trivy-package/action.yaml | 3 ++- .github/workflows/stage-1-commit.yaml | 4 ---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/actions/trivy-iac/action.yaml b/.github/actions/trivy-iac/action.yaml index 583f9356..d3134a67 100644 --- a/.github/actions/trivy-iac/action.yaml +++ b/.github/actions/trivy-iac/action.yaml @@ -8,7 +8,8 @@ runs: run: | components_exit_code=0 modules_exit_code=0 - + asdf plugin add trivy || true + asdf install trivy || true ./scripts/terraform/trivy-scan.sh --mode iac ./infrastructure/terraform/components || components_exit_code=$? ./scripts/terraform/trivy-scan.sh --mode iac ./infrastructure/terraform/modules || modules_exit_code=$? diff --git a/.github/actions/trivy-package/action.yaml b/.github/actions/trivy-package/action.yaml index d6ee4a3f..783948e6 100644 --- a/.github/actions/trivy-package/action.yaml +++ b/.github/actions/trivy-package/action.yaml @@ -7,7 +7,8 @@ runs: shell: bash run: | exit_code=0 - + asdf plugin add trivy || true + asdf install trivy || true ./scripts/terraform/trivy-scan.sh --mode package . || exit_code=$? if [ $exit_code -ne 0 ]; then diff --git a/.github/workflows/stage-1-commit.yaml b/.github/workflows/stage-1-commit.yaml index b604c42a..9e10fece 100644 --- a/.github/workflows/stage-1-commit.yaml +++ b/.github/workflows/stage-1-commit.yaml @@ -163,8 +163,6 @@ jobs: uses: actions/checkout@v4 - name: "Setup ASDF" uses: asdf-vm/actions/setup@1902764435ca0dd2f3388eea723a4f92a4eb8302 - - name: "Perform Setup" - uses: ./.github/actions/setup - name: "Trivy IaC Scan" uses: ./.github/actions/trivy-iac trivy-package: @@ -179,8 +177,6 @@ jobs: uses: actions/checkout@v4 - name: "Setup ASDF" uses: asdf-vm/actions/setup@1902764435ca0dd2f3388eea723a4f92a4eb8302 - - name: "Perform Setup" - uses: ./.github/actions/setup - name: "Trivy Package Scan" uses: ./.github/actions/trivy-package count-lines-of-code: