Skip to content

Commit fc175f5

Browse files
committed
grype don't get commit hash from version_helper
1 parent f9aa7f0 commit fc175f5

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/actions/create_workflow_report/action.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@ runs:
2222
- name: Create and upload workflow report
2323
env:
2424
ACTIONS_RUN_URL: ${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id }}
25+
COMMIT_SHA: ${{ steps.set_version.outputs.commit_sha || github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
2526
FINAL: ${{ inputs.final }}
2627
shell: bash
2728
run: |
2829
pip install clickhouse-driver==0.2.8 numpy==1.26.4 pandas==2.0.3 jinja2==3.1.5
2930
3031
CMD="python3 .github/actions/create_workflow_report/create_workflow_report.py"
31-
ARGS="--actions-run-url $ACTIONS_RUN_URL --known-fails tests/broken_tests.json --cves"
32+
ARGS="--actions-run-url $ACTIONS_RUN_URL --commit-sha $COMMIT_SHA --known-fails tests/broken_tests.json --cves"
3233
3334
set +e -x
3435
if [[ "$FINAL" == "false" ]]; then

.github/workflows/grype_scan.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ jobs:
6969
VERSION=$SPECIFIED_VERSION
7070
fi
7171
echo "docker_image=${{ inputs.docker_image }}:$PR_NUMBER-$VERSION$TAG_SUFFIX" >> $GITHUB_OUTPUT
72-
echo "commit_sha=$CLICKHOUSE_VERSION_GITHASH" >> $GITHUB_OUTPUT
7372
7473
- name: Run Grype Scan
7574
run: |
@@ -85,7 +84,7 @@ jobs:
8584
id: upload_results
8685
env:
8786
S3_BUCKET: "altinity-build-artifacts"
88-
COMMIT_SHA: ${{ steps.set_version.outputs.commit_sha || github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
87+
COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
8988
PR_NUMBER: ${{ env.PR_NUMBER || github.event.pull_request.number || 0 }}
9089
DOCKER_IMAGE: ${{ steps.set_version.outputs.docker_image || inputs.docker_image }}
9190
run: |

0 commit comments

Comments
 (0)