Skip to content

Commit 6a9cbc4

Browse files
committed
get grype to use same image version as was pushed
1 parent 08def75 commit 6a9cbc4

File tree

9 files changed

+18
-18
lines changed

9 files changed

+18
-18
lines changed

.github/workflows/backport_branches.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1366,7 +1366,7 @@ jobs:
13661366
secrets: inherit
13671367
with:
13681368
docker_image: altinityinfra/clickhouse-server
1369-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
1369+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
13701370
tag-suffix: ${{ matrix.suffix }}
13711371
GrypeScanKeeper:
13721372
needs: [config_workflow, docker_keeper_image]
@@ -1375,7 +1375,7 @@ jobs:
13751375
secrets: inherit
13761376
with:
13771377
docker_image: altinityinfra/clickhouse-keeper
1378-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
1378+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
13791379

13801380
RegressionTestsRelease:
13811381
needs: [config_workflow, build_amd_release]

.github/workflows/master.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4767,7 +4767,7 @@ jobs:
47674767
secrets: inherit
47684768
with:
47694769
docker_image: altinityinfra/clickhouse-server
4770-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
4770+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
47714771
tag-suffix: ${{ matrix.suffix }}
47724772
GrypeScanKeeper:
47734773
needs: [config_workflow, docker_keeper_image]
@@ -4776,7 +4776,7 @@ jobs:
47764776
secrets: inherit
47774777
with:
47784778
docker_image: altinityinfra/clickhouse-keeper
4779-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
4779+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
47804780

47814781
RegressionTestsRelease:
47824782
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
@@ -335,7 +335,7 @@ jobs:
335335
secrets: inherit
336336
with:
337337
docker_image: altinityinfra/clickhouse-server
338-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
338+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
339339
tag-suffix: ${{ matrix.suffix }}
340340
GrypeScanKeeper:
341341
needs: [config_workflow, docker_keeper_image]
@@ -344,7 +344,7 @@ jobs:
344344
secrets: inherit
345345
with:
346346
docker_image: altinityinfra/clickhouse-keeper
347-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
347+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
348348

349349
RegressionTestsRelease:
350350
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
@@ -241,7 +241,7 @@ jobs:
241241
secrets: inherit
242242
with:
243243
docker_image: altinityinfra/clickhouse-server
244-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
244+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
245245
tag-suffix: ${{ matrix.suffix }}
246246
GrypeScanKeeper:
247247
needs: [config_workflow, docker_keeper_image]
@@ -250,7 +250,7 @@ jobs:
250250
secrets: inherit
251251
with:
252252
docker_image: altinityinfra/clickhouse-keeper
253-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
253+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
254254

255255
RegressionTestsRelease:
256256
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
@@ -241,7 +241,7 @@ jobs:
241241
secrets: inherit
242242
with:
243243
docker_image: altinityinfra/clickhouse-server
244-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
244+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
245245
tag-suffix: ${{ matrix.suffix }}
246246
GrypeScanKeeper:
247247
needs: [config_workflow, docker_keeper_image]
@@ -250,7 +250,7 @@ jobs:
250250
secrets: inherit
251251
with:
252252
docker_image: altinityinfra/clickhouse-keeper
253-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
253+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
254254

255255
RegressionTestsRelease:
256256
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
@@ -113,7 +113,7 @@ jobs:
113113
secrets: inherit
114114
with:
115115
docker_image: altinityinfra/clickhouse-server
116-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
116+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
117117
tag-suffix: ${{ matrix.suffix }}
118118
GrypeScanKeeper:
119119
needs: [config_workflow, docker_keeper_image]
@@ -122,7 +122,7 @@ jobs:
122122
secrets: inherit
123123
with:
124124
docker_image: altinityinfra/clickhouse-keeper
125-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
125+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
126126

127127
RegressionTestsRelease:
128128
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
@@ -4728,7 +4728,7 @@ jobs:
47284728
secrets: inherit
47294729
with:
47304730
docker_image: altinityinfra/clickhouse-server
4731-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
4731+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
47324732
tag-suffix: ${{ matrix.suffix }}
47334733
GrypeScanKeeper:
47344734
needs: [config_workflow, docker_keeper_image]
@@ -4737,7 +4737,7 @@ jobs:
47374737
secrets: inherit
47384738
with:
47394739
docker_image: altinityinfra/clickhouse-keeper
4740-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
4740+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
47414741

47424742
RegressionTestsRelease:
47434743
needs: [config_workflow, build_amd_release]

.github/workflows/release_branches.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1774,7 +1774,7 @@ jobs:
17741774
secrets: inherit
17751775
with:
17761776
docker_image: altinityinfra/clickhouse-server
1777-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
1777+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
17781778
tag-suffix: ${{ matrix.suffix }}
17791779
GrypeScanKeeper:
17801780
needs: [config_workflow, docker_keeper_image]
@@ -1783,7 +1783,7 @@ jobs:
17831783
secrets: inherit
17841784
with:
17851785
docker_image: altinityinfra/clickhouse-keeper
1786-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
1786+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
17871787

17881788
RegressionTestsRelease:
17891789
needs: [config_workflow, build_amd_release]

ci/praktika/yaml_additional_templates.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class AltinityWorkflowTemplates:
4242
secrets: inherit
4343
with:
4444
docker_image: altinityinfra/clickhouse-server
45-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
45+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
4646
tag-suffix: ${{ matrix.suffix }}
4747
GrypeScanKeeper:
4848
needs: [config_workflow, docker_keeper_image]
@@ -51,7 +51,7 @@ class AltinityWorkflowTemplates:
5151
secrets: inherit
5252
with:
5353
docker_image: altinityinfra/clickhouse-keeper
54-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
54+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
5555
5656
RegressionTestsRelease:
5757
needs: [config_workflow, build_amd_release]

0 commit comments

Comments
 (0)