From 7a6fa5a457c969d96575f9729229f1aa25b9bee6 Mon Sep 17 00:00:00 2001 From: Matt Andreko Date: Wed, 20 Aug 2025 09:39:11 -0400 Subject: [PATCH] Revert "Temporarily hold sarif uploads (#6166)" (#6222) --- .github/workflows/build.yml | 12 ++++++------ .github/workflows/scan.yml | 2 -- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7de7798a39..30fcf29206 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -275,12 +275,12 @@ jobs: fail-build: false output-format: sarif -# - name: Upload Grype results to GitHub -# uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8 -# with: -# sarif_file: ${{ steps.container-scan.outputs.sarif }} -# sha: ${{ contains(github.event_name, 'pull_request') && github.event.pull_request.head.sha || github.sha }} -# ref: ${{ contains(github.event_name, 'pull_request') && format('refs/pull/{0}/head', github.event.pull_request.number) || github.ref }} + - name: Upload Grype results to GitHub + uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8 + with: + sarif_file: ${{ steps.container-scan.outputs.sarif }} + sha: ${{ contains(github.event_name, 'pull_request') && github.event.pull_request.head.sha || github.sha }} + ref: ${{ contains(github.event_name, 'pull_request') && format('refs/pull/{0}/head', github.event.pull_request.number) || github.ref }} - name: Log out from Azure uses: bitwarden/gh-actions/azure-logout@main diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml index 04629ec899..f1d9370c29 100644 --- a/.github/workflows/scan.yml +++ b/.github/workflows/scan.yml @@ -38,8 +38,6 @@ jobs: pull-requests: write security-events: write id-token: write - with: - upload-sarif: false quality: name: Sonar