Skip to content

Commit 55b62d7

Browse files
rustyconoverclaude
andcommitted
ci: build and test v2.0 against Haybarn 2.0 rc9 and vgi.v3 fixtures
The distribution pipeline still built against haybarn-v1.5.5-rc1 with the 1.5 ci-tools, so every 2.0 build failed on 2.0-only engine headers. Use haybarn-v2.0.0-rc9 with ci-tools haybarn-2.0, as the community 2.0 lane does. The integration suite cloned vgi-python's default branch, whose fixture workers host only vgi.v2, so ATTACH failed with ProtocolNotSupportedError. Default the fixtures to the vgi.v3 SDK release v0.48.0. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
1 parent 87ac2d6 commit 55b62d7

2 files changed

Lines changed: 20 additions & 15 deletions

File tree

‎.github/workflows/MainDistributionPipeline.yml‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,26 +36,29 @@ jobs:
3636

3737
duckdb-stable-build:
3838
name: Build extension binaries
39-
uses: Query-farm-haybarn/haybarn-extension-ci-tools/.github/workflows/_extension_distribution.yml@haybarn
39+
# The v2.0 branch builds against the Haybarn 2.0 engine with the 2.0 line of
40+
# the Haybarn ci-tools fork, the same pairing as the community haybarn-2.0
41+
# lane. Keep duckdb_version in lockstep with the duckdb submodule's tag.
42+
uses: Query-farm-haybarn/haybarn-extension-ci-tools/.github/workflows/_extension_distribution.yml@haybarn-2.0
4043
secrets:
4144
vcpkg_token: ${{ secrets.HAYBARN_VCPKG_TOKEN }}
45+
VCPKG_CACHING_AWS_ACCESS_KEY_ID: ${{ secrets.HAYBARN_BUILD_CACHE_R2_ACCESS_KEY_ID }}
46+
VCPKG_CACHING_AWS_SECRET_ACCESS_KEY: ${{ secrets.HAYBARN_BUILD_CACHE_R2_SECRET_ACCESS_KEY }}
47+
VCPKG_CACHING_AWS_ENDPOINT_URL: ${{ secrets.R2_ENDPOINT }}
4248
with:
43-
duckdb_version: haybarn-v1.5.5-rc1
44-
ci_tools_version: haybarn
49+
duckdb_version: haybarn-v2.0.0-rc9
50+
ci_tools_version: haybarn-2.0
51+
override_duckdb_repository: 'https://github.com/Query-farm-haybarn/haybarn'
4552
override_ci_tools_repository: 'Query-farm-haybarn/haybarn-extension-ci-tools'
4653
extension_name: vgi
47-
# This artifact is not consumed and is consistently the slowest matrix
48-
# leg (roughly 20 minutes even with warm vcpkg and ccache state).
49-
exclude_archs: 'windows_amd64_mingw'
50-
use_prebuilt_images: true
51-
use_prebuilt_wasm_image: true
54+
# wasm_mvp, osx_amd64 and windows_arm64 are not built on the 2.0 line.
55+
# windows_amd64_mingw is not consumed and is consistently the slowest
56+
# matrix leg (roughly 20 minutes even with warm vcpkg and ccache state).
57+
exclude_archs: 'wasm_mvp;osx_amd64;windows_arm64;windows_amd64_mingw'
58+
# vcpkg release 2026.06.24, the 2.0-line pin.
59+
vcpkg_commit: 'cd61e1e26a038e82d6550a3ebbe0fbbfe7da78e3'
5260
# The embedded Iroh connector is compiled from the pinned Rust source as
53-
# part of the extension, so both native Linux and WASM builders need the
54-
# prebuilt image variants that contain Cargo. `extra_toolchains` controls
55-
# inline image builds, but does not alter an already-published image.
56-
image_variant: rust
57-
wasm_image_variant: rust
58-
prebuilt_image_tag: v1.5.5
61+
# part of the extension, so the builders need Cargo.
5962
extra_toolchains: parser_tools;rust
6063
# NOTE: this pipeline does NOT run the VGI integration suite.
6164
#

‎.github/workflows/integration.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ jobs:
4242
env:
4343
VGI_INSTALL_FIXTURES: "1"
4444
VGI_FIXTURES_DIR: /tmp/vgi-python
45-
VGI_FIXTURES_REF: ${{ inputs.fixtures_ref }}
45+
# v2.0 speaks vgi.v3; vgi-python's default branch still hosts vgi.v2 until
46+
# the 0.48.0 release (vgi-python#98) merges, so pin the v3 SDK release.
47+
VGI_FIXTURES_REF: ${{ inputs.fixtures_ref || 'v0.48.0' }}
4648
GEN: ninja
4749
BUILD_VGI_FILTER_V2_TESTS: "1"
4850
USE_MERGED_VCPKG_MANIFEST: "1"

0 commit comments

Comments
 (0)