Skip to content

Commit 6f5f6f1

Browse files
zvonandzvonand
authored
Merge branch 'antalya-25.6.5' into backport/antalya-25.6.5/84011
2 parents d242870 + 8de897c commit 6f5f6f1

File tree

17 files changed

+287
-58
lines changed

17 files changed

+287
-58
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/actions/create_workflow_report/create_workflow_report.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -592,6 +592,8 @@ def get_build_report_links(
592592
for job in build_job_names:
593593
if job not in build_report_links:
594594
build_report_links[job] = link_template.format(job_name=job)
595+
596+
if len(build_report_links) > 0:
595597
return build_report_links
596598

597599
# No cache or build result was found, guess the links

‎.github/workflows/backport_branches.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1494,7 +1494,7 @@ jobs:
14941494
secrets: inherit
14951495
with:
14961496
docker_image: altinityinfra/clickhouse-server
1497-
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
1497+
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
14981498
tag-suffix: ${{ matrix.suffix }}
14991499
GrypeScanKeeper:
15001500
needs: [config_workflow, docker_keeper_image]
@@ -1503,7 +1503,7 @@ jobs:
15031503
secrets: inherit
15041504
with:
15051505
docker_image: altinityinfra/clickhouse-keeper
1506-
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
1506+
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
15071507

15081508
RegressionTestsRelease:
15091509
needs: [config_workflow, build_amd_release]

‎.github/workflows/grype_scan.yml‎

Lines changed: 7 additions & 5 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: |
@@ -132,15 +131,18 @@ jobs:
132131
with:
133132
github-token: ${{ secrets.GITHUB_TOKEN }}
134133
script: |
134+
const totalHighCritical = '${{ steps.create_summary.outputs.total_high_critical }}';
135+
const hasError = totalHighCritical === '';
136+
const hasVulnerabilities = parseInt(totalHighCritical) > 0;
135137
github.rest.repos.createCommitStatus({
136138
owner: context.repo.owner,
137139
repo: context.repo.repo,
138140
sha: '${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}',
139-
state: '${{ steps.create_summary.outputs.total_high_critical > 0 && 'failure' || 'success' }}',
141+
state: hasError ? 'error' : hasVulnerabilities ? 'failure' : 'success',
140142
target_url: '${{ steps.upload_results.outputs.https_s3_path }}/results.html',
141-
description: 'Grype Scan Completed with ${{ steps.create_summary.outputs.total_high_critical }} high/critical vulnerabilities',
143+
description: hasError ? 'An error occurred' : `Grype Scan Completed with ${totalHighCritical} high/critical vulnerabilities`,
142144
context: 'Grype Scan ${{ steps.set_version.outputs.docker_image || inputs.docker_image }}'
143-
})
145+
});
144146
145147
- name: Upload artifacts
146148
if: always()

‎.github/workflows/master.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4597,7 +4597,7 @@ jobs:
45974597
secrets: inherit
45984598
with:
45994599
docker_image: altinityinfra/clickhouse-server
4600-
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
4600+
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
46014601
tag-suffix: ${{ matrix.suffix }}
46024602
GrypeScanKeeper:
46034603
needs: [config_workflow, docker_keeper_image]
@@ -4606,7 +4606,7 @@ jobs:
46064606
secrets: inherit
46074607
with:
46084608
docker_image: altinityinfra/clickhouse-keeper
4609-
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
4609+
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
46104610

46114611
RegressionTestsRelease:
46124612
needs: [config_workflow, build_amd_release]

‎.github/workflows/merge_queue.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ jobs:
363363
secrets: inherit
364364
with:
365365
docker_image: altinityinfra/clickhouse-server
366-
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
366+
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
367367
tag-suffix: ${{ matrix.suffix }}
368368
GrypeScanKeeper:
369369
needs: [config_workflow, docker_keeper_image]
@@ -372,7 +372,7 @@ jobs:
372372
secrets: inherit
373373
with:
374374
docker_image: altinityinfra/clickhouse-keeper
375-
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
375+
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
376376

377377
RegressionTestsRelease:
378378
needs: [config_workflow, build_amd_release]

‎.github/workflows/nightly_fuzzers.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ jobs:
261261
secrets: inherit
262262
with:
263263
docker_image: altinityinfra/clickhouse-server
264-
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
264+
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
265265
tag-suffix: ${{ matrix.suffix }}
266266
GrypeScanKeeper:
267267
needs: [config_workflow, docker_keeper_image]
@@ -270,7 +270,7 @@ jobs:
270270
secrets: inherit
271271
with:
272272
docker_image: altinityinfra/clickhouse-keeper
273-
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
273+
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
274274

275275
RegressionTestsRelease:
276276
needs: [config_workflow, build_amd_release]

‎.github/workflows/nightly_jepsen.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ jobs:
261261
secrets: inherit
262262
with:
263263
docker_image: altinityinfra/clickhouse-server
264-
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
264+
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
265265
tag-suffix: ${{ matrix.suffix }}
266266
GrypeScanKeeper:
267267
needs: [config_workflow, docker_keeper_image]
@@ -270,7 +270,7 @@ jobs:
270270
secrets: inherit
271271
with:
272272
docker_image: altinityinfra/clickhouse-keeper
273-
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
273+
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
274274

275275
RegressionTestsRelease:
276276
needs: [config_workflow, build_amd_release]

‎.github/workflows/nightly_statistics.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ jobs:
121121
secrets: inherit
122122
with:
123123
docker_image: altinityinfra/clickhouse-server
124-
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
124+
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
125125
tag-suffix: ${{ matrix.suffix }}
126126
GrypeScanKeeper:
127127
needs: [config_workflow, docker_keeper_image]
@@ -130,7 +130,7 @@ jobs:
130130
secrets: inherit
131131
with:
132132
docker_image: altinityinfra/clickhouse-keeper
133-
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
133+
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
134134

135135
RegressionTestsRelease:
136136
needs: [config_workflow, build_amd_release]

‎.github/workflows/pull_request.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3924,7 +3924,7 @@ jobs:
39243924
secrets: inherit
39253925
with:
39263926
docker_image: altinityinfra/clickhouse-server
3927-
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
3927+
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
39283928
tag-suffix: ${{ matrix.suffix }}
39293929
GrypeScanKeeper:
39303930
needs: [config_workflow, docker_keeper_image]
@@ -3933,7 +3933,7 @@ jobs:
39333933
secrets: inherit
39343934
with:
39353935
docker_image: altinityinfra/clickhouse-keeper
3936-
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
3936+
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
39373937

39383938
RegressionTestsRelease:
39393939
needs: [config_workflow, build_amd_release]

0 commit comments

Comments
 (0)