mirror of
https://github.com/hanzoai/datastore.git
synced 2026-09-26 13:55:07 +00:00
Alexei FedotovandClaude Opus 4.8
9f61dd71cc
#109867 deleted the PR-specific version tests, so nothing guarded the rule that a PR build records tweak 1 regardless of the git-history tweak. Extract the version computation into `version_log._build_version` and add `ci/tests/test_version_log.py`, which asserts a PR run pins the tweak to 1 in both sinks -- the `version_history` row and the pipeline kv data -- even when `get_current_version` yields a different git tweak, and that a non-PR run keeps the git tweak. Related: https://github.com/ClickHouse/ClickHouse/pull/110661#discussion_r3594334517 Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>
50 lines
1.9 KiB
Python
50 lines
1.9 KiB
Python
from datetime import datetime
|
|
|
|
from praktika.info import Info
|
|
from praktika.utils import Shell
|
|
|
|
from ci.jobs.scripts.cidb_cluster import CIDBCluster
|
|
from ci.jobs.scripts.clickhouse_version import CHVersion
|
|
|
|
|
|
def _build_version(info):
|
|
"""The build version recorded for this run.
|
|
|
|
In a PR the tweak is pinned to 1. `HEAD` is the ephemeral merge commit,
|
|
whose first-parent commit count diverges across close/reopen and re-runs of
|
|
the same PR as `master` advances. Artifacts are keyed by the head SHA, so an
|
|
unpinned tweak would store diverging version strings -- both in the
|
|
`version_history` log and in the packages built from the pipeline kv data --
|
|
under one artifact prefix. The tweak is meaningless in a PR anyway."""
|
|
version = CHVersion.get_current_version(no_strict=True)
|
|
if info.pr_number != 0:
|
|
version = version.with_tweak(1)
|
|
return version
|
|
|
|
|
|
def _add_build_to_version_history():
|
|
info = Info()
|
|
Shell.check(
|
|
f"git rev-parse --is-shallow-repository | grep -q true && git fetch --unshallow --prune --no-recurse-submodules --filter=tree:0 origin {info.git_branch} ||:"
|
|
)
|
|
commit_parents = Shell.get_output("git log --format=%P -n 1").split(" ")
|
|
version = _build_version(info)
|
|
data = {
|
|
"check_start_time": datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
|
|
"pull_request_number": info.pr_number,
|
|
"pull_request_url": info.pr_url,
|
|
"commit_sha": info.sha,
|
|
"commit_url": info.commit_url,
|
|
"parent_commits_sha": commit_parents,
|
|
"version": version.string,
|
|
"git_ref": info.git_branch,
|
|
}
|
|
print(f"Update version log: [{data}]")
|
|
CIDBCluster().insert_json(table="version_history", json_str=data)
|
|
# stores actual version data in pipline storage, to be used by jobs that need it
|
|
version.store_version_data_in_ci_pipeline()
|
|
|
|
|
|
if __name__ == "__main__":
|
|
_add_build_to_version_history()
|