Skip to content

Commit 7ad7f02

Browse files
mbrobbelclaude
andcommitted
Make vcpkg overlay ports and triplets directories configurable
Add `vcpkg_overlay_ports` and `vcpkg_overlay_triplets` workflow inputs so extensions can override the default overlay directories. Defaults match the current hardcoded paths, keeping existing builds unaffected. Also fixes a typo in the triplets path (`extensions-ci-tools` → `extension-ci-tools`). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent e203276 commit 7ad7f02

1 file changed

Lines changed: 12 additions & 2 deletions

File tree

.github/workflows/_extension_distribution.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,16 @@ on:
179179
required: false
180180
type: string
181181
default: ""
182+
# Override vcpkg overlay ports directory (relative to repo root, mounted at /duckdb_build_dir in Docker)
183+
vcpkg_overlay_ports:
184+
required: false
185+
type: string
186+
default: 'extension-ci-tools/vcpkg_ports'
187+
# Override vcpkg overlay triplets directory
188+
vcpkg_overlay_triplets:
189+
required: false
190+
type: string
191+
default: 'extension-ci-tools/toolchains'
182192

183193
env:
184194
VCPKG_BINARY_SOURCES: ${{inputs.vcpkg_binary_sources == '' && 'clear;http,https://vcpkg-cache.duckdb.org,read' || inputs.vcpkg_binary_sources }}
@@ -377,8 +387,8 @@ jobs:
377387
AWS_DEFAULT_REGION=${{ secrets.VCPKG_CACHING_AWS_DEFAULT_REGION }}
378388
AWS_REQUEST_CHECKSUM_CALCULATION=when_required
379389
VCPKG_TARGET_TRIPLET=${{ matrix.vcpkg_target_triplet }}
380-
VCPKG_OVERLAY_TRIPLETS=/duckdb_build_dir/extensions-ci-tools/toolchains
381-
VCPKG_OVERLAY_PORTS=/duckdb_build_dir/extension-ci-tools/vcpkg_ports
390+
VCPKG_OVERLAY_TRIPLETS=/duckdb_build_dir/${{ inputs.vcpkg_overlay_triplets }}
391+
VCPKG_OVERLAY_PORTS=/duckdb_build_dir/${{ inputs.vcpkg_overlay_ports }}
382392
BUILD_SHELL=${{ inputs.build_duckdb_shell && '1' || '0' }}
383393
OPENSSL_ROOT_DIR=/duckdb_build_dir/build/${{ inputs.build_type }}/vcpkg_installed/${{ matrix.vcpkg_target_triplet }}
384394
OPENSSL_DIR=/duckdb_build_dir/build/${{ inputs.build_type }}/vcpkg_installed/${{ matrix.vcpkg_target_triplet }}

0 commit comments

Comments
 (0)