Skip to content

Commit 6ab7f9e

Browse files
strtgbbstrtgbb
authored
Merge pull request #906 from Altinity/cicd-rebase-25.6.2.5-stable
25.6 disable unused hooks in PR and master workflows
2 parents 222bf17 + cbaeeba commit 6ab7f9e

14 files changed

+62
-185
lines changed

‎.github/compare_ci_fails.py‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.github/workflows/backport_branches.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1369,7 +1369,7 @@ jobs:
13691369
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
13701370
tag-suffix: ${{ matrix.suffix }}
13711371
GrypeScanKeeper:
1372-
needs: [config_workflow, docker_keeper_image]
1372+
needs: [config_workflow, docker_keeper_image]
13731373
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VyIGtlZXBlciBpbWFnZQ==') }}
13741374
uses: ./.github/workflows/grype_scan.yml
13751375
secrets: inherit
@@ -1379,7 +1379,7 @@ jobs:
13791379

13801380
RegressionTestsRelease:
13811381
needs: [config_workflow, build_amd_release]
1382-
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).ci_settings.exclude_keywords, 'regression')}}
1382+
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression-->')}}
13831383
uses: ./.github/workflows/regression.yml
13841384
secrets: inherit
13851385
with:
@@ -1391,7 +1391,7 @@ jobs:
13911391
workflow_config: ${{ needs.config_workflow.outputs.data }}
13921392
RegressionTestsAarch64:
13931393
needs: [config_workflow, build_arm_release]
1394-
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).ci_settings.exclude_keywords, 'regression') && !contains(fromJson(needs.config_workflow.outputs.data).ci_settings.exclude_keywords, 'aarch64')}}
1394+
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression-->') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_aarch64-->')}}
13951395
uses: ./.github/workflows/regression.yml
13961396
secrets: inherit
13971397
with:

‎.github/workflows/master.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4729,7 +4729,7 @@ jobs:
47294729
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
47304730
tag-suffix: ${{ matrix.suffix }}
47314731
GrypeScanKeeper:
4732-
needs: [config_workflow, docker_keeper_image]
4732+
needs: [config_workflow, docker_keeper_image]
47334733
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VyIGtlZXBlciBpbWFnZQ==') }}
47344734
uses: ./.github/workflows/grype_scan.yml
47354735
secrets: inherit
@@ -4739,7 +4739,7 @@ jobs:
47394739

47404740
RegressionTestsRelease:
47414741
needs: [config_workflow, build_amd_release]
4742-
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).ci_settings.exclude_keywords, 'regression')}}
4742+
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression-->')}}
47434743
uses: ./.github/workflows/regression.yml
47444744
secrets: inherit
47454745
with:
@@ -4751,7 +4751,7 @@ jobs:
47514751
workflow_config: ${{ needs.config_workflow.outputs.data }}
47524752
RegressionTestsAarch64:
47534753
needs: [config_workflow, build_arm_release]
4754-
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).ci_settings.exclude_keywords, 'regression') && !contains(fromJson(needs.config_workflow.outputs.data).ci_settings.exclude_keywords, 'aarch64')}}
4754+
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression-->') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_aarch64-->')}}
47554755
uses: ./.github/workflows/regression.yml
47564756
secrets: inherit
47574757
with:

‎.github/workflows/merge_queue.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ jobs:
338338
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
339339
tag-suffix: ${{ matrix.suffix }}
340340
GrypeScanKeeper:
341-
needs: [config_workflow, docker_keeper_image]
341+
needs: [config_workflow, docker_keeper_image]
342342
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VyIGtlZXBlciBpbWFnZQ==') }}
343343
uses: ./.github/workflows/grype_scan.yml
344344
secrets: inherit
@@ -348,7 +348,7 @@ jobs:
348348

349349
RegressionTestsRelease:
350350
needs: [config_workflow, build_amd_release]
351-
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).ci_settings.exclude_keywords, 'regression')}}
351+
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression-->')}}
352352
uses: ./.github/workflows/regression.yml
353353
secrets: inherit
354354
with:
@@ -360,7 +360,7 @@ jobs:
360360
workflow_config: ${{ needs.config_workflow.outputs.data }}
361361
RegressionTestsAarch64:
362362
needs: [config_workflow, build_arm_release]
363-
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).ci_settings.exclude_keywords, 'regression') && !contains(fromJson(needs.config_workflow.outputs.data).ci_settings.exclude_keywords, 'aarch64')}}
363+
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression-->') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_aarch64-->')}}
364364
uses: ./.github/workflows/regression.yml
365365
secrets: inherit
366366
with:

‎.github/workflows/nightly_fuzzers.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ jobs:
244244
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
245245
tag-suffix: ${{ matrix.suffix }}
246246
GrypeScanKeeper:
247-
needs: [config_workflow, docker_keeper_image]
247+
needs: [config_workflow, docker_keeper_image]
248248
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VyIGtlZXBlciBpbWFnZQ==') }}
249249
uses: ./.github/workflows/grype_scan.yml
250250
secrets: inherit
@@ -254,7 +254,7 @@ jobs:
254254

255255
RegressionTestsRelease:
256256
needs: [config_workflow, build_amd_release]
257-
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).ci_settings.exclude_keywords, 'regression')}}
257+
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression-->')}}
258258
uses: ./.github/workflows/regression.yml
259259
secrets: inherit
260260
with:
@@ -266,7 +266,7 @@ jobs:
266266
workflow_config: ${{ needs.config_workflow.outputs.data }}
267267
RegressionTestsAarch64:
268268
needs: [config_workflow, build_arm_release]
269-
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).ci_settings.exclude_keywords, 'regression') && !contains(fromJson(needs.config_workflow.outputs.data).ci_settings.exclude_keywords, 'aarch64')}}
269+
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression-->') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_aarch64-->')}}
270270
uses: ./.github/workflows/regression.yml
271271
secrets: inherit
272272
with:

‎.github/workflows/nightly_jepsen.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ jobs:
244244
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
245245
tag-suffix: ${{ matrix.suffix }}
246246
GrypeScanKeeper:
247-
needs: [config_workflow, docker_keeper_image]
247+
needs: [config_workflow, docker_keeper_image]
248248
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VyIGtlZXBlciBpbWFnZQ==') }}
249249
uses: ./.github/workflows/grype_scan.yml
250250
secrets: inherit
@@ -254,7 +254,7 @@ jobs:
254254

255255
RegressionTestsRelease:
256256
needs: [config_workflow, build_amd_release]
257-
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).ci_settings.exclude_keywords, 'regression')}}
257+
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression-->')}}
258258
uses: ./.github/workflows/regression.yml
259259
secrets: inherit
260260
with:
@@ -266,7 +266,7 @@ jobs:
266266
workflow_config: ${{ needs.config_workflow.outputs.data }}
267267
RegressionTestsAarch64:
268268
needs: [config_workflow, build_arm_release]
269-
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).ci_settings.exclude_keywords, 'regression') && !contains(fromJson(needs.config_workflow.outputs.data).ci_settings.exclude_keywords, 'aarch64')}}
269+
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression-->') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_aarch64-->')}}
270270
uses: ./.github/workflows/regression.yml
271271
secrets: inherit
272272
with:

‎.github/workflows/nightly_statistics.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ jobs:
116116
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
117117
tag-suffix: ${{ matrix.suffix }}
118118
GrypeScanKeeper:
119-
needs: [config_workflow, docker_keeper_image]
119+
needs: [config_workflow, docker_keeper_image]
120120
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VyIGtlZXBlciBpbWFnZQ==') }}
121121
uses: ./.github/workflows/grype_scan.yml
122122
secrets: inherit
@@ -126,7 +126,7 @@ jobs:
126126

127127
RegressionTestsRelease:
128128
needs: [config_workflow, build_amd_release]
129-
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).ci_settings.exclude_keywords, 'regression')}}
129+
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression-->')}}
130130
uses: ./.github/workflows/regression.yml
131131
secrets: inherit
132132
with:
@@ -138,7 +138,7 @@ jobs:
138138
workflow_config: ${{ needs.config_workflow.outputs.data }}
139139
RegressionTestsAarch64:
140140
needs: [config_workflow, build_arm_release]
141-
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).ci_settings.exclude_keywords, 'regression') && !contains(fromJson(needs.config_workflow.outputs.data).ci_settings.exclude_keywords, 'aarch64')}}
141+
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression-->') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_aarch64-->')}}
142142
uses: ./.github/workflows/regression.yml
143143
secrets: inherit
144144
with:

0 commit comments

Comments
 (0)