thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 00:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use JobNames.STYLE_CHECK for consistency

Browse Source
This commit is contained in:
Mikhail f. Shiryaev 2024-01-30 18:46:53 +01:00
parent 7af7255b90
commit bfa722bf62
No known key found for this signature in database
GPG Key ID: 4B02ED204C7D93F4
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/ci/ci.py
View File

@ -268,11 +268,11 @@ def _check_and_update_for_early_style_check(run_config: dict) -> None:
jobs_to_do = run_config.get("jobs_data", {}).get("jobs_to_do", []) jobs_to_do = run_config.get("jobs_data", {}).get("jobs_to_do", [])
docker_to_build = run_config.get("docker_data", {}).get("missing_multi", []) docker_to_build = run_config.get("docker_data", {}).get("missing_multi", [])
if ( if (
"Style check" in jobs_to_do JobNames.STYLE_CHECK in jobs_to_do
and docker_to_build and docker_to_build
and "clickhouse/style-test" not in docker_to_build and "clickhouse/style-test" not in docker_to_build
): ):
index = jobs_to_do.index("Style check") index = jobs_to_do.index(JobNames.STYLE_CHECK)
jobs_to_do[index] = "Style check early" jobs_to_do[index] = "Style check early"

4
tests/ci/ci_config.py
View File

@ -1231,10 +1231,10 @@ CHECK_DESCRIPTIONS = [
lambda x: x.startswith("Stress test ("), lambda x: x.startswith("Stress test ("),
), ),
CheckDescription( CheckDescription(
"Style Check", JobNames.STYLE_CHECK,
"Runs a set of checks to keep the code style clean. If some of tests failed, " "Runs a set of checks to keep the code style clean. If some of tests failed, "
"see the related log from the report", "see the related log from the report",
lambda x: x == "Style Check", lambda x: x == JobNames.STYLE_CHECK,
), ),
CheckDescription( CheckDescription(
"Unit tests", "Unit tests",

3
tests/ci/style_check.py
View File

@ -8,7 +8,6 @@ import sys
from pathlib import Path from pathlib import Path
from typing import List, Tuple from typing import List, Tuple
from docker_images_helper import get_docker_image, pull_image from docker_images_helper import get_docker_image, pull_image
from env_helper import REPO_COPY, TEMP_PATH from env_helper import REPO_COPY, TEMP_PATH
from git_helper import GIT_PREFIX, git_runner from git_helper import GIT_PREFIX, git_runner
@ -17,8 +16,6 @@ from report import JobReport, TestResults, read_test_results
from ssh import SSHKey from ssh import SSHKey
from stopwatch import Stopwatch from stopwatch import Stopwatch
NAME = "Style Check"
def process_result( def process_result(
result_directory: Path, result_directory: Path,