Files
zeekay 9a90943b8f merge: ClickHouse 26.7.1.1315-stable into datastore — preserve debrand
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.
2026-07-26 14:47:43 -07:00

81 lines
3.0 KiB
Python

from praktika import Job, Secret, Workflow
from ci.defs.defs import SECRETS
robot_token_secret = Secret.Config(
name="ROBOT_HANZO_COMMIT_TOKEN",
type=Secret.Type.GH_SECRET,
)
release_job = Job.Config(
name="CreateRelease",
runs_on=["self-hosted", "amd-release-maker"],
command="PYTHONPATH=. python3 ./ci/jobs/release_job.py",
timeout=2 * 3600,
# Push release tags/branches with the robot PAT (the App token lacks the
# `workflow` scope, so GitHub's push-time workflow-scope check times out and
# rejects tags whose `.github/workflows` differ from master — i.e. every
# release-branch tag). release_job.py exports it as GH_TOKEN.
secrets=[robot_token_secret],
)
workflow = Workflow.Config(
name="CreateRelease",
event=Workflow.Event.DISPATCH,
jobs=[release_job],
secrets=SECRETS + [robot_token_secret],
# Releases mutate shared state (tags, package repos, Docker tags); never run
# two concurrently. Dispatch workflows always emit `concurrency: group:
# ${{ github.workflow }}`, which serializes CreateRelease runs. auto_releases.yml
# reuses this workflow via `uses:`, relying on the `workflow_call` trigger that
# dispatch workflows now always emit.
# Route the job's pass/fail to the Slack Praktika app (the praktika-native
# replacement for the dropped CIBuddy notifications), as master /
# release_branches / pull_request do, so a failed release is not silent.
enable_slack_feed=True,
inputs=[
Workflow.Config.InputConfig(
name="ref",
description="Git reference (branch or commit SHA) from which to create the release",
is_required=True,
default_value="",
),
Workflow.Config.InputConfig(
name="type",
description="Release type - new for a new release branch, patch for a patch release",
is_required=True,
default_value="patch",
options=["patch", "new"],
),
Workflow.Config.InputConfig(
name="only-repo",
description="Run only repo updates including docker (repo-recovery, tests)",
is_required=False,
default_value="false",
is_boolean=True,
),
Workflow.Config.InputConfig(
name="only-docker",
description="Run only docker builds (repo-recovery, tests)",
is_required=False,
default_value="false",
is_boolean=True,
),
Workflow.Config.InputConfig(
name="dry-run",
description="Dry run — show what would be done without making changes",
is_required=False,
default_value="false",
is_boolean=True,
),
Workflow.Config.InputConfig(
name="assignee",
description="GitHub login to assign the changelog PR to (optional)",
is_required=False,
default_value="",
),
],
)
WORKFLOWS = [workflow]