Skip to content

Commit c97a07e

Browse files
committed
make sure to use '1' not 'true'
1 parent f2466b4 commit c97a07e

File tree

6 files changed

+7
-10
lines changed

6 files changed

+7
-10
lines changed

.github/workflows/backport_branches.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ env:
1717
# Force the stdout and stderr streams to be unbuffered
1818
PYTHONUNBUFFERED: 1
1919
DISABLE_CI_MERGE_COMMIT: ${{ vars.DISABLE_CI_MERGE_COMMIT || '0' }}
20-
DISABLE_CI_CACHE: ${{ github.event.inputs.no_cache || '0' }}
20+
DISABLE_CI_CACHE: ${{ github.event.inputs.no_cache && '1' || '0' }}
2121
CHECKOUT_REF: ${{ vars.DISABLE_CI_MERGE_COMMIT == '1' && github.event.pull_request.head.sha || '' }}
2222
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
2323
CLICKHOUSE_TEST_STAT_URL: ${{ secrets.CLICKHOUSE_TEST_STAT_URL }}

.github/workflows/master.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
env:
1717
# Force the stdout and stderr streams to be unbuffered
1818
PYTHONUNBUFFERED: 1
19-
DISABLE_CI_CACHE: ${{ github.event.inputs.no_cache || '0' }}
19+
DISABLE_CI_CACHE: ${{ github.event.inputs.no_cache && '1' || '0' }}
2020
CHECKOUT_REF: ""
2121
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
2222
CLICKHOUSE_TEST_STAT_URL: ${{ secrets.CLICKHOUSE_TEST_STAT_URL }}

.github/workflows/pull_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ env:
1717
# Force the stdout and stderr streams to be unbuffered
1818
PYTHONUNBUFFERED: 1
1919
DISABLE_CI_MERGE_COMMIT: ${{ vars.DISABLE_CI_MERGE_COMMIT || '0' }}
20-
DISABLE_CI_CACHE: ${{ github.event.inputs.no_cache || '0' }}
20+
DISABLE_CI_CACHE: ${{ github.event.inputs.no_cache && '1' || '0' }}
2121
CHECKOUT_REF: ${{ vars.DISABLE_CI_MERGE_COMMIT == '1' && github.event.pull_request.head.sha || '' }}
2222
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
2323
CLICKHOUSE_TEST_STAT_URL: ${{ secrets.CLICKHOUSE_TEST_STAT_URL }}

.github/workflows/release_branches.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
env:
1717
# Force the stdout and stderr streams to be unbuffered
1818
PYTHONUNBUFFERED: 1
19-
DISABLE_CI_CACHE: ${{ github.event.inputs.no_cache || '0' }}
19+
DISABLE_CI_CACHE: ${{ github.event.inputs.no_cache && '1' || '0' }}
2020
CHECKOUT_REF: ""
2121
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
2222
CLICKHOUSE_TEST_STAT_URL: ${{ secrets.CLICKHOUSE_TEST_STAT_URL }}

ci/praktika/native_jobs.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -360,10 +360,7 @@ def _check_db(workflow):
360360
)
361361
)
362362

363-
pr_allows_cache = (
364-
"[x] <!---no_ci_cache" not in Info().pr_body
365-
or os.environ.get("DISABLE_CI_CACHE", "0") not in ("1", "true")
366-
)
363+
pr_allows_cache = "[x] <!---no_ci_cache" not in Info().pr_body
367364
if (
368365
workflow.enable_job_filtering_by_changes
369366
and results[-1].is_ok()

ci/praktika/yaml_generator.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ class Templates:
6161
"""
6262
TEMPLATE_ENV_CHECKOUT_REF_PR = """\
6363
DISABLE_CI_MERGE_COMMIT: ${{{{ vars.DISABLE_CI_MERGE_COMMIT || '0' }}}}
64-
DISABLE_CI_CACHE: ${{{{ github.event.inputs.no_cache || '0' }}}}
64+
DISABLE_CI_CACHE: ${{{{ github.event.inputs.no_cache && '1' || '0' }}}}
6565
CHECKOUT_REF: ${{{{ vars.DISABLE_CI_MERGE_COMMIT == '1' && github.event.pull_request.head.sha || '' }}}}\
6666
"""
6767
TEMPLATE_ENV_CHECKOUT_REF_PUSH = """\
68-
DISABLE_CI_CACHE: ${{{{ github.event.inputs.no_cache || '0' }}}}
68+
DISABLE_CI_CACHE: ${{{{ github.event.inputs.no_cache && '1' || '0' }}}}
6969
CHECKOUT_REF: ""\
7070
"""
7171
TEMPLATE_ENV_CHECKOUT_REF_DEFAULT = """\

0 commit comments

Comments
 (0)