merge in develop

Signed-off-by: Neil South <[email protected]>
Project-MONAI · Oct 4, 2023 · b5c1cde · b5c1cde
2 parents 26b3138 + 387803f
commit b5c1cde
Show file tree

Hide file tree

Showing 106 changed files with 2,132 additions and 3,667 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -99,13 +99,12 @@ jobs:
           report-name: dockle-report
           failure-threshold: fatal
 
-      # Disable upload due to bug https://github.com/erzz/dockle-action/issues/18
-      # - name: Upload Dockle SARIF Report
-      #   uses: github/codeql-action/upload-sarif@v2
-      #   continue-on-error: true
-      #   if: ${{ contains(github.ref, 'refs/heads/main') || contains(github.head_ref, 'release/') }}
-      #   with:
-      #     sarif_file: dockle-report.sarif
+      - name: Upload Dockle SARIF Report
+        uses: github/codeql-action/upload-sarif@v2
+        continue-on-error: true
+        if: ${{ contains(github.ref, 'refs/heads/main') || contains(github.head_ref, 'release/') }}
+        with:
+          sarif_file: dockle-report.sarif
 
       - name: Trivy Vulnerability Scanner
         uses: aquasecurity/trivy-action@master