diff --git a/.github/actions/scan-docker-image/action.yaml b/.github/actions/scan-docker-image/action.yaml index caf0cdea6df..49fe889ab85 100644 --- a/.github/actions/scan-docker-image/action.yaml +++ b/.github/actions/scan-docker-image/action.yaml @@ -29,7 +29,7 @@ runs: output: "trivy-results.sarif" severity: ${{ inputs.severity }} - # - name: Upload Trivy scan results to Security tab - # uses: github/codeql-action/upload-sarif@v2 - # with: - # sarif_file: "trivy-results.sarif" + - name: Upload Trivy scan results to Security tab + uses: github/codeql-action/upload-sarif@v2 + with: + sarif_file: "trivy-results.sarif" diff --git a/.github/workflows/_docker-image.yaml b/.github/workflows/_docker-image.yaml index c3662fe11b1..625751a8e98 100644 --- a/.github/workflows/_docker-image.yaml +++ b/.github/workflows/_docker-image.yaml @@ -13,7 +13,7 @@ on: default: "" concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref != 'refs/heads/main' && github.ref || github.sha }}-${{ github.event_name }}-${{ inputs.target }} + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref != 'refs/heads/main' && github.ref || github.sha }}-${{ github.event_name }} cancel-in-progress: true jobs: