Skip to content

Commit 8c34f72

Browse files
authored
fix: docker workflow security upload (#1951)
* Fix artifact upload paths for CodeQL and SBOM results - Correct CodeQL SARIF path from **/results to ../results (relative to workspace) - Add fallback path for SBOM to handle different generation locations - This should resolve the 'No files were found' warnings for artifacts * Test commit to trigger Security Analysis workflow with fixed artifact paths * Update docker.yaml * Update security.yaml * Update security.yaml
1 parent b88eb6e commit 8c34f72

File tree

3 files changed

+9
-19
lines changed

3 files changed

+9
-19
lines changed

.github/workflows/docker.yaml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,6 @@ jobs:
6161
tags: ${{ steps.meta.outputs.tags }}
6262
labels: ${{ steps.meta.outputs.labels }}
6363

64-
- name: Run Trivy vulnerability scanner
65-
uses: aquasecurity/trivy-action@master
66-
with:
67-
image-ref: ${{ env.REGISTRY }}/${{ steps.image.outputs.name }}:${{ steps.meta.outputs.version }}
68-
format: 'sarif'
69-
output: 'trivy-results.sarif'
70-
71-
- name: Upload Trivy scan results to GitHub Security
72-
uses: github/codeql-action/upload-sarif@v3
73-
if: always()
74-
with:
75-
sarif_file: 'trivy-results.sarif'
7664

7765
- name: Check manifest
7866
run: docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ steps.image.outputs.name }}:${{ steps.meta.outputs.version }}

.github/workflows/security.yaml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
codeql:
1919
name: CodeQL Analysis
2020
runs-on: ubuntu-latest
21-
timeout-minutes: 360
21+
timeout-minutes: 45
2222

2323
strategy:
2424
fail-fast: false
@@ -35,23 +35,22 @@ jobs:
3535
languages: ${{ matrix.language }}
3636
queries: security-extended,security-and-quality
3737

38-
- name: Setup and Build
39-
uses: ./.github/actions/setup-and-build
38+
- name: Autobuild
39+
uses: github/codeql-action/autobuild@v3
4040

4141
- name: Perform CodeQL Analysis
4242
uses: github/codeql-action/analyze@v3
4343
with:
4444
category: "/language:${{matrix.language}}"
4545
upload: false
46+
output: "codeql-results"
4647

4748
- name: Upload CodeQL results as artifact
4849
uses: actions/upload-artifact@v4
4950
if: always()
5051
with:
5152
name: codeql-results-${{ matrix.language }}
52-
path: |
53-
**/results/**/*.sarif
54-
**/results/**/*.sarif.json
53+
path: codeql-results
5554

5655
dependency-scan:
5756
name: Dependency Vulnerability Scan
@@ -90,7 +89,9 @@ jobs:
9089
if: always()
9190
with:
9291
name: sbom-results
93-
path: sbom.spdx.json
92+
path: |
93+
sbom.spdx.json
94+
**/sbom.spdx.json
9495
9596
secrets-scan:
9697
name: Secrets Detection

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,3 +366,4 @@ For answers to common questions, issues, and to see a list of recommended models
366366
**Who needs a commercial WebContainer API license?**
367367

368368
bolt.diy source code is distributed as MIT, but it uses WebContainers API that [requires licensing](https://webcontainers.io/enterprise) for production usage in a commercial, for-profit setting. (Prototypes or POCs do not require a commercial license.) If you're using the API to meet the needs of your customers, prospective customers, and/or employees, you need a license to ensure compliance with our Terms of Service. Usage of the API in violation of these terms may result in your access being revoked.
369+
# Test commit to trigger Security Analysis workflow

0 commit comments

Comments
 (0)