Skip to content

Commit 2b0fdb7

Browse files
Merge pull request #40 from marcusburghardt/upload_duplicate_name
fix: duplicated names when uploading artifacts
2 parents f83da29 + 04752be commit 2b0fdb7

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/reusable_scheduled.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
scan-args: "${{ inputs.scan-args }}"
3434
fail-on-vuln: true
3535
upload-sarif: true
36-
results-file-name: osv-scanner-scheduled-results-${{ github.workflow }}-${{ github.job }}.sarif
36+
results-file-name: osv-scanner-scheduled-results-${{ github.workflow_sha }}-${{ github.run_number }}.sarif
3737

3838
call_reusable_security:
3939
name: OpenSSF Scorecards

.github/workflows/reusable_security.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,18 @@ jobs:
3333
- name: "Run analysis"
3434
uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
3535
with:
36-
results_file: scorecard-results-${{ github.workflow }}-${{ github.job }}.sarif
36+
results_file: scorecard-results-${{ github.workflow_sha }}-${{ github.run_number }}.sarif
3737
results_format: sarif
3838
publish_results: true
3939

4040
- name: "Upload artifact"
4141
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
4242
with:
43-
name: SARIF file
44-
path: scorecard-results-${{ github.workflow }}-${{ github.job }}.sarif
43+
name: Scorecard SARIF file
44+
path: scorecard-results-${{ github.workflow_sha }}-${{ github.run_number }}.sarif
4545
retention-days: 5
4646

4747
- name: "Upload to code-scanning"
4848
uses: github/codeql-action/upload-sarif@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
4949
with:
50-
sarif_file: scorecard-results-${{ github.workflow }}-${{ github.job }}.sarif
50+
sarif_file: scorecard-results-${{ github.workflow_sha }}-${{ github.run_number }}.sarif

.github/workflows/reusable_vuln_scan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ jobs:
3333
scan-args: "${{ inputs.scan-args }}"
3434
fail-on-vuln: true
3535
upload-sarif: true
36-
results-file-name: osv-scanner-pr-results-${{ github.workflow }}-${{ github.job }}.sarif
36+
results-file-name: osv-scanner-pr-results-${{ github.workflow_sha }}-${{ github.run_number }}.sarif

0 commit comments

Comments
 (0)