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.

Sign up for GitHub

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

Fix extensions's cmake passing via config option #1794

Merged
merged 2 commits into from
Jul 19, 2024
Merged

Fix extensions's cmake passing via config option #1794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e6b291
Use external cmake to point to extensions to be built
carlopi Jul 19, 2024
169d951
Add additional folder to 'make clean'
carlopi Jul 19, 2024
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
3 changes: 0 additions & 3 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,6 @@ jobs:

- name: Build Wasm module
run: |
cp .github/config/extension_config_wasm.cmake submodules/duckdb/extension/extension_config.cmake
DUCKDB_PLATFORM="wasm_mvp" DUCKDB_WASM_LOADABLE_EXTENSIONS=1 GEN=ninja ./scripts/wasm_build_lib.sh relsize mvp

- name: Upload artifact
Expand Down Expand Up @@ -554,7 +553,6 @@ jobs:

- name: Build Wasm module
run: |
cp .github/config/extension_config_wasm.cmake submodules/duckdb/extension/extension_config.cmake
DUCKDB_PLATFORM="wasm_eh" DUCKDB_WASM_LOADABLE_EXTENSIONS=1 GEN=ninja ./scripts/wasm_build_lib.sh relsize eh

- name: Upload artifact
Expand Down Expand Up @@ -598,7 +596,6 @@ jobs:

- name: Build Wasm module
run: |
cp .github/config/extension_config_wasm.cmake submodules/duckdb/extension/extension_config.cmake
DUCKDB_PLATFORM="wasm_threads" DUCKDB_WASM_LOADABLE_EXTENSIONS="signed" GEN=ninja ./scripts/wasm_build_lib.sh relsize coi

- name: Upload artifact
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,6 @@ app: wasm wasmpack shell docs js_tests_release
yarn workspace @duckdb/duckdb-wasm-app build:release

build_loadable:
cp .github/config/extension_config_wasm.cmake submodules/duckdb/extension/extension_config.cmake
DUCKDB_PLATFORM=wasm_${TARGET} DUCKDB_WASM_LOADABLE_EXTENSIONS=1 GEN=ninja ./scripts/wasm_build_lib.sh relsize ${TARGET}

build_loadable_unsigned: build_loadable
Expand Down Expand Up @@ -428,6 +427,7 @@ clean:
cd packages/duckdb-wasm-shell && rm -rf node_modules
rm -rf packages/duckdb-wasm-app/build
rm -rf submodules/duckdb/build
rm -rf packages/duckdb-wasm/dist

build/docker_ci_image:
command -v emcc &> /dev/null || docker compose build
Expand Down
0 .github/config/extension_config_wasm.cmake → extension_config_wasm.cmake
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions scripts/wasm_build_lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ emcmake cmake \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DDUCKDB_LOCATION=${DUCKDB_LOCATION} \
-DWASM_LINK_FLAGS_EXT="${LINK_FLAGS}" \
-DDUCKDB_EXTENSION_CONFIGS=extension_config_wasm.cmake \
${ADDITIONAL_FLAGS}

emmake make \
Expand Down