Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .github/workflows/dist_pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,17 @@ jobs:
ci_tools_version: main
extension_name: gaggle
enable_rust: true
opt_in_archs: "windows_arm64"
exclude_archs: "windows_amd64_mingw;osx_amd64;wasm_mvp;wasm_eh;wasm_threads"

duckdb-stable-build:
uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.5.4
uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.5.5
with:
duckdb_version: v1.5.4
ci_tools_version: v1.5.4
duckdb_version: v1.5.5
ci_tools_version: v1.5.5
extension_name: gaggle
enable_rust: true
opt_in_archs: "windows_arm64"
exclude_archs: "windows_amd64_mingw;osx_amd64;wasm_mvp;wasm_eh;wasm_threads"

create-release-draft:
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ target/
*_output.txt
standalone-build/
_rust.h
uv.lock
#uv.lock
tests/temp_models/
*.cast
*.proptest-regressions
Expand Down
21 changes: 18 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,22 @@ elseif(_GAGGLE_OS_ARCH STREQUAL "aarch64" OR _GAGGLE_OS_ARCH STREQUAL "arm64")
endif()
set(OS_ARCH "${_GAGGLE_OS_ARCH}")

# Derive DUCKDB_PLATFORM if missing (this is a rough heuristic mirroring DuckDB naming convention)
# Valid values: linux_amd64, linux_arm64, osx_amd64, osx_arm64, osx_universal, windows_amd64
# Note: we do not currently handle Windows ARM (windows_arm64) as DuckDB does not provide such builds.
# The DuckDB build system passes DUCKDB_EXPLICIT_PLATFORM with the authoritative target
# platform (for example windows_arm64). On cross-arch runners the inherited OS_ARCH can be
# wrong (the windows_arm64 runner reports OS_ARCH=amd64), so prefer the explicit platform.
if(NOT "${DUCKDB_EXPLICIT_PLATFORM}" STREQUAL "")
set(DUCKDB_PLATFORM "${DUCKDB_EXPLICIT_PLATFORM}")
if(DUCKDB_EXPLICIT_PLATFORM MATCHES "arm64|aarch64")
set(_GAGGLE_OS_ARCH arm64)
set(OS_ARCH "${_GAGGLE_OS_ARCH}")
elseif(DUCKDB_EXPLICIT_PLATFORM MATCHES "amd64|x86_64|x64")
set(_GAGGLE_OS_ARCH amd64)
set(OS_ARCH "${_GAGGLE_OS_ARCH}")
endif()
endif()

# Derive DUCKDB_PLATFORM if missing (this is a rough heuristic that mimics DuckDB naming convention)
# Valid values: linux_amd64, linux_arm64, osx_amd64, osx_arm64, osx_universal, windows_amd64, windows_arm64
# Note: we do not currently handle musl vs gnu variants on Linux; users can manually set DUCKDB_PLATFORM if needed.
# Note: we do not currently handle wasm variants; users can manually set DUCKDB_PLATFORM if needed.
set(DUCKDB_PLATFORM "${DUCKDB_PLATFORM}")
Expand All @@ -59,6 +72,8 @@ if("${DUCKDB_PLATFORM}" STREQUAL "")
elseif(WIN32)
if(_GAGGLE_OS_ARCH STREQUAL "amd64")
set(DUCKDB_PLATFORM windows_amd64)
elseif(_GAGGLE_OS_ARCH STREQUAL "arm64")
set(DUCKDB_PLATFORM windows_arm64)
endif()
endif()
endif()
Expand Down
99 changes: 82 additions & 17 deletions gaggle/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies = [

[project.optional-dependencies]
dev = [
"pytest (>=8.0.1,<9.0.0)",
"pytest (>=8.0.1,<10.0.0)",
"pytest-cov (>=6.0.0,<7.0.0)",
"pytest-mock (>=3.14.0,<4.0.0)",
"pytest-asyncio (>=0.26.0,<0.27.0)",
Expand Down
Loading
Loading