Skip to content

Consolidate release lines: merge posthog/v1.5.3 into posthog/v1.5.5 - #34

Merged
fuziontech merged 2 commits into
posthog/v1.5.5from
merge/v1.5.3-into-v1.5.5
Jul 30, 2026
Merged

Consolidate release lines: merge posthog/v1.5.3 into posthog/v1.5.5#34
fuziontech merged 2 commits into
posthog/v1.5.5from
merge/v1.5.3-into-v1.5.5

Conversation

@fuziontech

@fuziontech fuziontech commented Jul 30, 2026

Copy link
Copy Markdown
Member

Summary

Zero content changes — this is a history-consolidation merge. GitHub shows no changed files because that is the point: both branches already converged to byte-identical trees (both pin DuckDB submodule d8cdaa33 / v1.5.5, both have identical .github/duckdb-version and test/configs/attach_ducklake.json — the same changes landed independently on each side, via 2580114/74cfcbe4 here and via #33 on posthog/v1.5.3).

What this merge fixes is the branch topology: posthog/v1.5.3 and posthog/v1.5.5 currently diverge in history (each has commits the other lacks), so every git log/comparison reports phantom divergence even though the content is identical. After this merges:

  • posthog/v1.5.5 contains the full posthog/v1.5.3 history — one unambiguous release line
  • PRs target posthog/v1.5.5 going forward; posthog/v1.5.3 can be retired
  • next release tag (v1.0-posthog.7) cuts from here
  • follow-up: bump DUCKLAKE_EXTENSION_TAG in duckgres Dockerfile/Dockerfile.worker (currently v1.0-posthog.6) once tagged

Test plan

  • git diff posthog/v1.5.5 <merge-commit> is empty — provably no content change
  • git merge-tree dry-run: no conflicts
  • Submodule pin unchanged (d8cdaa33, DuckDB v1.5.5)
  • CI on this PR (should be a no-op build identical to the branch tip)

🤖 Generated with Claude Code

https://claude.ai/code/session_01LUnQHp46rmLKdupmDUr7kG

fuziontech and others added 2 commits July 29, 2026 09:59
* Bump DuckDB submodule to v1.5.5

Moves the pin from v1.5.3 (14eca11b) to v1.5.5 (d8cdaa33). No DuckLake
source changes were needed - the extension builds clean against v1.5.5
and the full suite passes: 16083 assertions in 451 test cases.

Note this does NOT bring in VARIANT extract pushdown. That lives only on
duckdb main; the v1.5-variegata branch is 20 commits past v1.5.5 and
still ships the pre-rewrite reader (variant_shredded_conversion.cpp,
no IsPushdownExtract), so upstream is not backporting it to the 1.5 line.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Mntu6YhMuqNBFD9snXqvBR

* Build against v1.5.5 in CI, not just locally

The submodule bump alone was not enough. MainDistributionPipeline's
get-duckdb-version job reads .github/duckdb-version and passes it to
_extension_distribution.yml, which checks out that DuckDB version itself
rather than using the submodule. So CI - including the tagged release
build that produces ducklake-linux-{amd64,arm64}.duckdb_extension - would
still have compiled against v1.5.3 while the submodule said v1.5.5.

Local `make release` uses the submodule and was genuinely built and
tested against v1.5.5; only the CI path was wrong.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Mntu6YhMuqNBFD9snXqvBR

* Port upstream DuckDB-test skips for v1.5.5

Bumping to v1.5.5 pulls in DuckDB's newer test suite, and the DBMS
Catalog Tests job runs that suite against a DuckLake backend. 11 of its
4087 cases failed - 10 of them tests that do not exist at v1.5.3 - so
these are newly-added upstream conformance tests exposing long-standing
DuckLake gaps, not regressions from the bump.

Upstream ducklake already made exactly these calls when it moved to
duckdb main (see "Fix and skip duckdb tests in ducklake", which added 136
lines to this file). Every entry here is ported verbatim from upstream
main's attach_ducklake.json, reasons included, so we are not inventing
policy:

  - native compression/storage-file internals (patas, rle, dict_fsst)
  - native db-file invalidation, checkpoint and WAL-revert semantics
  - DuckLake gives table entries a new object id on ALTER, so the oid
    stability assertion cannot hold
  - parquet writer does not support non-root VARIANT columns
  - TIMETZ second-precision offsets are quantized by parquet storage
  - two with upstream's own FIXME/"different error message" notes

test_add_col_if_not_exists_default is covered by upstream's
skip_error_messages entry rather than a path skip, so that string is
added too.

Note the diff is larger than the change: json round-trip normalised
pre-existing inconsistent indentation. Semantically this is exactly
+10 skip paths and +1 skip_error_message, nothing removed or altered -
verified by comparing the parsed JSON before and after.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Mntu6YhMuqNBFD9snXqvBR

---------

Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
Consolidates the two release lines onto posthog/v1.5.5 as the single
branch for the DuckDB v1.5.5 era. Both branches already pinned the same
DuckDB submodule commit (d8cdaa33); this merge brings over the
.github/duckdb-version bump and attach_ducklake.json config updates
that landed via #33 on the v1.5.3 branch, alongside the v1.5.5 CI and
test-skip commits unique to this branch.

After this merges, PRs should target posthog/v1.5.5 and the next
release tag (v1.0-posthog.7) cuts from here.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fork/posthog/v1.5.3:
  Bump DuckDB submodule to v1.5.5 (#33)
@fuziontech
fuziontech requested a review from a team July 30, 2026 08:57
@fuziontech
fuziontech merged commit 30a43a4 into posthog/v1.5.5 Jul 30, 2026
28 of 39 checks passed
@fuziontech
fuziontech deleted the merge/v1.5.3-into-v1.5.5 branch July 30, 2026 09:07
@fuziontech
fuziontech requested a review from a team July 30, 2026 09:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants