Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change DuckDB to static linking #3370

Merged
merged 17 commits into from
Apr 24, 2024
Merged
Show file tree
Hide file tree
Changes from 14 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
10 changes: 3 additions & 7 deletions .github/workflows/build-extensions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,16 +102,12 @@ jobs:
run: docker stop kuzu-x86

build-mac-extensions-arm64:
runs-on: macos-14
runs-on: self-hosted-mac-arm
steps:
- uses: actions/checkout@v3

- name: Install dependencies
run: |
brew install duckdb openssl@3

- name: Build precompiled extensions
run: make extension-release LTO=1 NUM_THREADS=$(nproc)
run: env OPENSSL_ROOT_DIR=/opt/homebrew/Cellar/openssl@3/3.3.0 make extension-release LTO=1 NUM_THREADS=$(sysctl -n hw.logicalcpu)
env:
MACOSX_DEPLOYMENT_TARGET: 11.0
CMAKE_OSX_ARCHITECTURES: "arm64"
Expand All @@ -133,7 +129,7 @@ jobs:
- uses: actions/checkout@v3

- name: Build precompiled extensions
run: make extension-release LTO=1 NUM_THREADS=$(nproc)
run: make extension-release LTO=1 NUM_THREADS=$(sysctl -n hw.logicalcpu)
env:
MACOSX_DEPLOYMENT_TARGET: 11.0
CMAKE_OSX_ARCHITECTURES: "x86_64"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ jobs:

linux-extension-test:
name: linux extension test
needs: [gcc-build-test, clang-build-test]
# needs: [gcc-build-test, clang-build-test]
runs-on: kuzu-self-hosted-testing
env:
NUM_THREADS: 32
Expand Down Expand Up @@ -515,7 +515,7 @@ jobs:

macos-extension-test:
name: macos extension test
needs: [macos-build-test]
# needs: [macos-build-test]
runs-on: self-hosted-mac-x64
env:
NUM_THREADS: 32
Expand Down Expand Up @@ -551,7 +551,7 @@ jobs:

windows-extension-test:
name: windows extension test
needs: [msvc-build-test]
# needs: [msvc-build-test]
runs-on: self-hosted-windows
env:
# Shorten build path as much as possible
Expand Down
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@ extension-test:
$(call run-cmake-release, \
-DBUILD_EXTENSIONS="httpfs;duckdb_scanner;postgres_scanner" \
-DBUILD_EXTENSION_TESTS=TRUE \
-DENABLE_ADDRESS_SANITIZER=TRUE \
)
ctest --test-dir build/release/extension --output-on-failure -j ${TEST_JOBS}
aws s3 rm s3://kuzu-dataset-us/${RUN_ID}/ --recursive
Expand Down
4 changes: 4 additions & 0 deletions extension/duckdb_scanner/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
set(DuckDB_USE_STATIC_LIBS ON)
find_package(DuckDB REQUIRED)
if(NOT WIN32)
find_library(DuckDB_STATIC REQUIRED NAMES libduckdb_static.a)
endif()

include_directories(
${PROJECT_SOURCE_DIR}/src/include
Expand Down
4 changes: 4 additions & 0 deletions extension/postgres_scanner/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
set(DuckDB_USE_STATIC_LIBS ON)
find_package(DuckDB REQUIRED)
if(NOT WIN32)
find_library(DuckDB_STATIC REQUIRED NAMES libduckdb_static.a)
endif()

add_library(postgres_scanner
SHARED
Expand Down
Loading