From ca838b5ccf90dbb22fbd54a696ead0c8f6678abf Mon Sep 17 00:00:00 2001 From: Aaron Steinfeld Date: Wed, 9 Apr 2025 14:24:48 -0400 Subject: [PATCH 1/3] ci: debug --- trivy-image-scan/action.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/trivy-image-scan/action.yml b/trivy-image-scan/action.yml index 2a1c577..303916f 100644 --- a/trivy-image-scan/action.yml +++ b/trivy-image-scan/action.yml @@ -59,7 +59,7 @@ runs: TRIVY_OUTPUT="" if [ "${{ inputs.output-mode }}" = "github" ]; then TRIVY_FORMAT="sarif" - TRIVY_OUTPUT="''trivy-results.sarif''" + TRIVY_OUTPUT="'trivy-results.sarif'" elif [ "${{ inputs.output-mode }}" = "json" ]; then TRIVY_FORMAT="json" TRIVY_OUTPUT="trivy-results.json" @@ -118,6 +118,10 @@ runs: TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db TRIVY_JAVA_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-java-db + - name: ls + shell: bash + run: | + ls -al - name: Upload Trivy scan results to GitHub Security tab uses: github/codeql-action/upload-sarif@v3 if: (success() || failure()) && inputs.output-mode == 'github' && steps.output.outputs.TRIVY_OUTPUT != '' && inputs.category == '' From 299901c6b00878ce4eef239d2deb2ef21db2d2bd Mon Sep 17 00:00:00 2001 From: Aaron Steinfeld Date: Wed, 9 Apr 2025 14:37:52 -0400 Subject: [PATCH 2/3] fix: again --- trivy-image-scan/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trivy-image-scan/action.yml b/trivy-image-scan/action.yml index 303916f..da9bd96 100644 --- a/trivy-image-scan/action.yml +++ b/trivy-image-scan/action.yml @@ -59,7 +59,7 @@ runs: TRIVY_OUTPUT="" if [ "${{ inputs.output-mode }}" = "github" ]; then TRIVY_FORMAT="sarif" - TRIVY_OUTPUT="'trivy-results.sarif'" + TRIVY_OUTPUT="trivy-results.sarif" elif [ "${{ inputs.output-mode }}" = "json" ]; then TRIVY_FORMAT="json" TRIVY_OUTPUT="trivy-results.json" From 88d4b816c14e7ad59978e6743ee4024c0f3aa37a Mon Sep 17 00:00:00 2001 From: Aaron Steinfeld Date: Wed, 9 Apr 2025 14:43:06 -0400 Subject: [PATCH 3/3] fix: clean up debug --- trivy-image-scan/action.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/trivy-image-scan/action.yml b/trivy-image-scan/action.yml index da9bd96..3a72dcb 100644 --- a/trivy-image-scan/action.yml +++ b/trivy-image-scan/action.yml @@ -118,10 +118,6 @@ runs: TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db TRIVY_JAVA_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-java-db - - name: ls - shell: bash - run: | - ls -al - name: Upload Trivy scan results to GitHub Security tab uses: github/codeql-action/upload-sarif@v3 if: (success() || failure()) && inputs.output-mode == 'github' && steps.output.outputs.TRIVY_OUTPUT != '' && inputs.category == ''