mirror of
https://github.com/hanzoai/datastore.git
synced 2026-09-26 13:55:07 +00:00
zeekay
9a90943b8f
13,838 upstream commits, forward from the 26.6.1.1 fork point. 129 conflicts: 37 resolved mechanically (take upstream's file, re-apply the brand sweep) and 92 by hand where our fork and upstream had both changed the same code. The rule throughout: upstream owns the engine, we own the naming and a small set of deliberate deviations. Never resolve by discarding an upstream change — a dropped rename or a missed new parameter becomes a compile error a thousand files away. Deviations verified intact after the merge: ENABLE_XRAY still defaults OFF (CMakeLists.txt:105) X-Datastore-User read by the server (authenticateUserByHTTP.cpp) X-ClickHouse-* in src/ 0 hanzo/research present system.*_log retention bound present ArrowFlight rip held against upstream re-adding it Two things worth naming, because neither shows up as a conflict: src/CMakeLists.txt gained an UNGUARDED `add_object_library(datastore_storages_arrowflight Storages/ArrowFlight)` from upstream, for a directory our gRPC rip deleted. It sat outside every conflict hunk, so a resolver reading only the markers would sail straight past it into a CMake configure error. Removed; the Server/ArrowFlight sibling at line 474 stays because it is inside `if (TARGET ch_contrib::arrow_flight)`. The brand sweep had rewritten github.com/ClickHouse/ClickHouse issue links to github.com/Datastore/Datastore — a dead host. Those point at upstream's own tracker and are restored, alongside the contributors list, sql.clickhouse.com and the ClickHouse Inc copyright: attribution is theirs, not ours to rename. base/glibc-compatibility/memcpy/memcpy.h is deleted, not kept: upstream dropped it for LLVM-libc's, and our only change to it was a comment rebrand.
95 lines
3.3 KiB
Python
95 lines
3.3 KiB
Python
from praktika import Workflow
|
|
|
|
from ci.defs.defs import (
|
|
BASE_BRANCH,
|
|
BINARIES_WITH_LONG_RETENTION,
|
|
DOCKERS,
|
|
SECRETS,
|
|
ArtifactConfigs,
|
|
)
|
|
from ci.defs.job_configs import JobConfigs
|
|
from ci.jobs.scripts.workflow_hooks.filter_job import should_skip_job
|
|
from ci.workflows.pull_request import REGULAR_BUILD_NAMES
|
|
|
|
# Add long retention tags to subset of artifacts
|
|
clickhouse_binaries_with_tags = []
|
|
for artifact in ArtifactConfigs.clickhouse_binaries:
|
|
if artifact.name in BINARIES_WITH_LONG_RETENTION:
|
|
artifact = artifact.add_tags({"retention": "long"})
|
|
clickhouse_binaries_with_tags.append(artifact)
|
|
|
|
workflow = Workflow.Config(
|
|
name="MasterCI",
|
|
event=Workflow.Event.PUSH,
|
|
branches=[BASE_BRANCH],
|
|
jobs=[
|
|
*JobConfigs.tidy_build_arm_jobs,
|
|
*JobConfigs.build_jobs,
|
|
*JobConfigs.build_llvm_coverage_job,
|
|
*JobConfigs.release_build_jobs,
|
|
*JobConfigs.sccache_warmup_build_jobs,
|
|
*[
|
|
job.set_run_after(
|
|
REGULAR_BUILD_NAMES + [JobConfigs.tidy_build_arm_jobs[0].name]
|
|
)
|
|
for job in JobConfigs.special_build_jobs
|
|
],
|
|
*JobConfigs.unittest_jobs,
|
|
*JobConfigs.unittest_llvm_coverage_job,
|
|
JobConfigs.docker_server,
|
|
*JobConfigs.install_check_master_jobs,
|
|
*JobConfigs.compatibility_test_jobs,
|
|
*JobConfigs.functional_tests_jobs,
|
|
*JobConfigs.functional_test_llvm_coverage_jobs,
|
|
*JobConfigs.functional_test_excluded_from_llvm_job,
|
|
*JobConfigs.functional_tests_jobs_azure,
|
|
*JobConfigs.integration_test_jobs_required,
|
|
*JobConfigs.integration_test_jobs_non_required,
|
|
*JobConfigs.integration_test_llvm_coverage_jobs,
|
|
*JobConfigs.integration_test_excluded_from_llvm_job,
|
|
*JobConfigs.stress_test_jobs,
|
|
*JobConfigs.stress_test_azure_jobs,
|
|
*JobConfigs.ast_fuzzer_jobs,
|
|
*JobConfigs.buzz_fuzzer_jobs,
|
|
*JobConfigs.performance_comparison_with_master_head_jobs,
|
|
*JobConfigs.performance_comparison_with_release_base_jobs,
|
|
*JobConfigs.clickbench_jobs,
|
|
JobConfigs.sqltest_master_job,
|
|
JobConfigs.sqllogic_test_master_job,
|
|
JobConfigs.sqlstorm_test_job,
|
|
JobConfigs.llvm_coverage_job,
|
|
],
|
|
artifacts=[
|
|
*ArtifactConfigs.unittests_binaries,
|
|
*clickhouse_binaries_with_tags,
|
|
*ArtifactConfigs.clickhouse_debians,
|
|
*ArtifactConfigs.clickhouse_rpms,
|
|
*ArtifactConfigs.clickhouse_tgzs,
|
|
ArtifactConfigs.fuzzers,
|
|
ArtifactConfigs.fuzzers_corpus,
|
|
*ArtifactConfigs.llvm_profdata_file,
|
|
ArtifactConfigs.llvm_coverage_info_file,
|
|
],
|
|
dockers=DOCKERS,
|
|
enable_dockers_manifest_merge=True,
|
|
set_latest_for_docker_merged_manifest=True,
|
|
secrets=SECRETS,
|
|
enable_job_filtering_by_changes=True,
|
|
enable_cache=True,
|
|
enable_report=True,
|
|
enable_cidb=True,
|
|
enable_commit_status_on_failure=True,
|
|
enable_slack_feed=True,
|
|
pre_hooks=[
|
|
"python3 ./ci/jobs/scripts/workflow_hooks/store_data.py",
|
|
"python3 ./ci/jobs/scripts/workflow_hooks/version_log.py",
|
|
"python3 ./ci/jobs/scripts/workflow_hooks/merge_sync_pr.py",
|
|
],
|
|
workflow_filter_hooks=[should_skip_job],
|
|
post_hooks=[],
|
|
)
|
|
|
|
WORKFLOWS = [
|
|
workflow,
|
|
]
|