Skip to content

Commit fdfc1e7

Browse files
authored
Merge v1.19 into master (#1347)
2 parents 6bb2c93 + a703674 commit fdfc1e7

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ jobs:
166166
- name: "Generate SARIF report from code scanning alerts"
167167
uses: mongodb-labs/drivers-github-tools/code-scanning-export@v2
168168
with:
169-
ref: ${{ inputs.version }}
169+
ref: refs/tags/${{ inputs.version }}
170170
output-file: ${{ env.S3_ASSETS }}/code-scanning-alerts.json
171171

172172
- name: "Generate compliance report"

.github/workflows/static-analysis.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ jobs:
3434
with:
3535
ref: ${{ github.event_name == 'workflow_dispatch' && inputs.ref || github.ref }}
3636

37+
- name: "Get SHA hash of checked out ref"
38+
if: ${{ github.event_name == 'workflow_dispatch' }}
39+
run: |
40+
echo CHECKED_OUT_SHA=$(git rev-parse HEAD) >> $GITHUB_ENV
41+
3742
- name: "Setup"
3843
uses: "./.github/actions/setup"
3944
with:
@@ -44,6 +49,15 @@ jobs:
4449
run: "vendor/bin/psalm --show-info=false --stats --output-format=github --threads=$(nproc) --report=psalm.sarif"
4550

4651
- name: "Upload SARIF report"
52+
if: ${{ github.event_name != 'workflow_dispatch' }}
53+
uses: "github/codeql-action/upload-sarif@v3"
54+
with:
55+
sarif_file: psalm.sarif
56+
57+
- name: "Upload SARIF report"
58+
if: ${{ github.event_name == 'workflow_dispatch' }}
4759
uses: "github/codeql-action/upload-sarif@v3"
4860
with:
4961
sarif_file: psalm.sarif
62+
ref: ${{ inputs.ref }}
63+
sha: ${{ env.CHECKED_OUT_SHA }}

0 commit comments

Comments
 (0)