Skip to content

Stable 26.8 - Version logic rework - #2485

Open
strtgbb wants to merge 4 commits into
stable-26.8from
fix/stable-26.8/version-file-merge-conflicts
Open

strtgbb wants to merge 4 commits into
stable-26.8from
fix/stable-26.8/version-file-merge-conflicts

Conversation

@strtgbb

@strtgbb strtgbb commented Oct 5, 2026 •

Copy link
Copy Markdown
Collaborator

Upstream version logic has changed in 26.x, rework our customizations to minimize conflicts and improve functionality.

  • VERSION_STRING and VERSION_DESCRIBE are common merge conflicts, they are now automated.
  • Fix and improve tag validity checks. Get the flavour from tag so the altinitytest flavour remains supported.
    • Recognize new prelrease labels antalyatest and altinityfipstest alongside the existing altinitytest, which remains the default for local builds.
  • Recognize new prerelase labels antalyatest and altinityfipstest alongside the existing altinitytest, which remains the default for local builds.
  • Derive VERSION_FLAVOUR and first digit of VERSION_TWEAK from branch name so that it no longer gets forgotten when CICD gets rebased from stable to antalya and vice versa.

Next steps:

  • Derive VERSION_TWEAK by checking release history. This would remove the need for manual bumps.

Changelog category (leave one):

  • CI Fix or Improvement (changelog entry is not required)

CI/CD Options

Exclude tests:

  • Fast test
  • Integration Tests
  • Stateless tests
  • Stateful tests
  • Unit tests
  • Performance tests
  • Aarch64 tests
  • All with ASAN
  • All with TSAN
  • All with MSAN
  • All with UBSAN
  • All with Coverage
  • All Regression
  • Disable CI Cache

Regression jobs to run:

  • Fast suites (mostly <1h)
  • Aggregate Functions (2h)
  • Alter (1.5h)
  • Benchmark (30m)
  • CAS (content-addressed storage; Antalya only)
  • ClickHouse Keeper (1h)
  • Iceberg (2h)
  • LDAP (1h)
  • OAuth (5m)
  • Parquet (1.5h)
  • RBAC (1.5h)
  • SSL Server (1h)
  • S3 (2h)
  • S3 Export (2h)
  • Swarms (30m)
  • Tiered Storage (2h)

…rges no longer conflict.

Derive the flavoured string in version.cmake, take the release flavour from the tag, and check tags against VERSION_TWEAK plus the flavour track prefix instead of the committed describe line.

Co-authored-by: Cursor <cursoragent@cursor.com>
@strtgbb strtgbb added cicd Improvements and fixes to the CICD process 26.8 labels Oct 5, 2026
@github-actions

github-actions Bot commented Oct 5, 2026 •

Copy link
Copy Markdown

Workflow [PR], commit [68f16d5]

`check_tag_against_versions` holds the flavour and track-prefix rules. CI Tests can call it without `get_abs_path`, which needs a `.git` directory that the Docker pytest tree does not have.
https://github.com/Altinity/ClickHouse/actions/runs/37366277057/job/111984727269
#2485

Co-authored-by: Cursor <cursoragent@cursor.com>
@strtgbb
strtgbb requested a review from MyroTk October 8, 2026 15:23
strtgbb and others added 2 commits October 8, 2026 12:09
`--check-tag` now requires the tag flavour to be the release name for `VERSION_FLAVOUR` (`altinitytest` → `altinitystable`, `antalyatest` → `altinityantalya`, `altinityfipstest` → `altinityfips`).

Co-authored-by: Cursor <cursoragent@cursor.com>
… longer needs per-track edits.

Co-authored-by: Cursor <cursoragent@cursor.com>

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

26.8 cicd Improvements and fixes to the CICD process

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant