-
Notifications
You must be signed in to change notification settings - Fork 41
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #458 from Maxxen/v113
Update duckdb, set stable branch
- Loading branch information
Showing
10 changed files
with
56 additions
and
214 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,13 +5,13 @@ name: Stable Extension Distribution Pipeline | |
| on: | ||
| pull_request: | ||
| branches: | ||
| - v1.1.0 | ||
| - v1.1.3 | ||
| paths-ignore: | ||
| - '**/README.md' | ||
| - 'doc/**' | ||
| push: | ||
| branches: | ||
| - v1.1.0 | ||
| - v1.1.3 | ||
| paths-ignore: | ||
| - '**/README.md' | ||
| - 'doc/**' | ||
|
|
@@ -24,17 +24,18 @@ concurrency: | |
| jobs: | ||
| duckdb-stable-build: | ||
| name: Build extension binaries | ||
| uses: duckdb/extension-ci-tools/.github/workflows/[email protected].0 | ||
| uses: duckdb/extension-ci-tools/.github/workflows/[email protected].3 | ||
| with: | ||
| duckdb_version: v1.1.0 | ||
| duckdb_version: v1.1.3 | ||
| extension_name: spatial | ||
| ci_tools_version: v1.1.3 | ||
|
|
||
| duckdb-stable-deploy: | ||
| name: Deploy extension binaries | ||
| needs: duckdb-stable-build | ||
| uses: duckdb/extension-ci-tools/.github/workflows/[email protected].0 | ||
| uses: duckdb/extension-ci-tools/.github/workflows/[email protected].3 | ||
| secrets: inherit | ||
| with: | ||
| duckdb_version: v1.1.0 | ||
| duckdb_version: v1.1.3 | ||
| extension_name: spatial | ||
| deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/v1.1.0' }} | ||
| deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/v1.1.3' }} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,6 @@ | ||
| [submodule "duckdb"] | ||
| path = duckdb | ||
| url = https://github.com/duckdb/duckdb.git | ||
| [submodule "extension-ci-tools"] | ||
| path = extension-ci-tools | ||
| url = https://github.com/duckdb/extension-ci-tools.git |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,180 +1,8 @@ | ||
| .PHONY: all clean format debug release duckdb_debug duckdb_release pull update | ||
| PROJ_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) | ||
|
|
||
| all: release | ||
| # Configuration of extension | ||
| EXT_NAME=excel | ||
| EXT_CONFIG=${PROJ_DIR}extension_config.cmake | ||
|
|
||
| DUCKDB_SRCDIR ?= "./duckdb/" | ||
|
|
||
| MKFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) | ||
| PROJ_DIR := $(dir $(MKFILE_PATH)) | ||
|
|
||
| TEST_PATH="/test/unittest" | ||
| DUCKDB_PATH="/duckdb" | ||
|
|
||
| # For non-MinGW windows the path is slightly different | ||
| ifeq ($(OS),Windows_NT) | ||
| ifneq ($(CXX),g++) | ||
| TEST_PATH="/test/Release/unittest.exe" | ||
| DUCKDB_PATH="/Release/duckdb.exe" | ||
| endif | ||
| endif | ||
|
|
||
| #### OSX config | ||
| OSX_BUILD_FLAG= | ||
| ifneq (${OSX_BUILD_ARCH}, "") | ||
| OSX_BUILD_FLAG=-DOSX_BUILD_ARCH=${OSX_BUILD_ARCH} | ||
| endif | ||
|
|
||
| #### VCPKG config | ||
| VCPKG_TOOLCHAIN_PATH?= | ||
| ifneq ("${VCPKG_TOOLCHAIN_PATH}", "") | ||
| TOOLCHAIN_FLAGS:=${TOOLCHAIN_FLAGS} -DVCPKG_MANIFEST_DIR='${PROJ_DIR}' -DVCPKG_BUILD=1 -DCMAKE_TOOLCHAIN_FILE='${VCPKG_TOOLCHAIN_PATH}' | ||
| endif | ||
| ifneq ("${VCPKG_TARGET_TRIPLET}", "") | ||
| TOOLCHAIN_FLAGS:=${TOOLCHAIN_FLAGS} -DVCPKG_TARGET_TRIPLET='${VCPKG_TARGET_TRIPLET}' | ||
| endif | ||
| ifeq (${USE_MERGED_VCPKG_MANIFEST}, 1) | ||
| TOOLCHAIN_FLAGS:=${TOOLCHAIN_FLAGS} -DVCPKG_MANIFEST_DIR='${PROJ_DIR}build/extension_configuration' | ||
| else | ||
| TOOLCHAIN_FLAGS:=${TOOLCHAIN_FLAGS} -DVCPKG_MANIFEST_DIR='${PROJ_DIR}' | ||
| endif | ||
|
|
||
| #### Enable Ninja as generator | ||
| ifeq ($(GEN),ninja) | ||
| GENERATOR=-G "Ninja" -DFORCE_COLORED_OUTPUT=1 | ||
| endif | ||
|
|
||
| EXT_NAME=spatial | ||
|
|
||
| #### Configuration for this extension | ||
| EXTENSION_NAME=SPATIAL | ||
| EXTENSION_FLAGS=\ | ||
| -DENABLE_SANITIZER=OFF \ | ||
| -DDUCKDB_EXTENSION_NAMES="spatial" \ | ||
| -DDUCKDB_EXTENSION_${EXTENSION_NAME}_PATH="$(PROJ_DIR)" \ | ||
| -DDUCKDB_EXTENSION_${EXTENSION_NAME}_SHOULD_LINK=1 \ | ||
| -DDUCKDB_EXTENSION_${EXTENSION_NAME}_LOAD_TESTS=1 \ | ||
| -DDUCKDB_EXTENSION_${EXTENSION_NAME}_INCLUDE_PATH="$(PROJ_DIR)spatial/include" \ | ||
| -DDUCKDB_EXTENSION_${EXTENSION_NAME}_TEST_PATH="$(PROJ_DIR)test" \ | ||
| -DDUCKDB_EXTENSION_${EXTENSION_NAME}_LINKED_LIBS="../../deps/local/lib/*.a" | ||
|
|
||
| #### Add more of the DuckDB in-tree extensions here that you need (also feel free to remove them when not needed) | ||
| EXTRA_EXTENSIONS_FLAG=-DBUILD_EXTENSIONS="parquet;json" | ||
|
|
||
| BUILD_FLAGS=-DEXTENSION_STATIC_BUILD=1 $(EXTENSION_FLAGS) ${EXTRA_EXTENSIONS_FLAG} $(OSX_BUILD_FLAG) $(TOOLCHAIN_FLAGS) -DDUCKDB_EXPLICIT_PLATFORM='${DUCKDB_PLATFORM}' | ||
| ifeq (${BUILD_SHELL}, 0) | ||
| BUILD_FLAGS += -DBUILD_SHELL=0 | ||
| else | ||
| ifeq ($(OS),Windows_NT) | ||
| BUILD_FLAGS += -DBUILD_SHELL=0 | ||
| endif | ||
| endif | ||
|
|
||
| ifeq (${BUILD_BENCHMARK}, 1) | ||
| BUILD_FLAGS += -DBUILD_BENCHMARKS=1 | ||
| endif | ||
|
|
||
| CLIENT_FLAGS:= | ||
|
|
||
| #### Main build | ||
| # For regular CLI build, we link the spatial extension directly into the DuckDB executable | ||
| CLIENT_FLAGS=-DDUCKDB_EXTENSION_${EXTENSION_NAME}_SHOULD_LINK=1 | ||
|
|
||
| debug: | ||
| mkdir -p build/debug && \ | ||
| cmake $(GENERATOR) $(BUILD_FLAGS) $(CLIENT_FLAGS) -DCMAKE_BUILD_TYPE=Debug -S ./duckdb/ -B build/debug && \ | ||
| cmake --build build/debug --config Debug | ||
|
|
||
| release: | ||
| mkdir -p build/release && \ | ||
| cmake $(GENERATOR) $(BUILD_FLAGS) $(CLIENT_FLAGS) -DCMAKE_BUILD_TYPE=Release -S ./duckdb/ -B build/release && \ | ||
| cmake --build build/release --config Release | ||
|
|
||
| reldebug: | ||
| mkdir -p build/reldebug && \ | ||
| cmake $(GENERATOR) $(BUILD_FLAGS) $(CLIENT_FLAGS) -DCMAKE_BUILD_TYPE=RelWithDebInfo -S ./duckdb/ -B build/reldebug && \ | ||
| cmake --build build/reldebug --config RelWithDebInfo | ||
|
|
||
| ##### Client build | ||
| JS_BUILD_FLAGS=-DBUILD_NODE=1 -DDUCKDB_EXTENSION_${EXTENSION_NAME}_SHOULD_LINK=0 | ||
| PY_BUILD_FLAGS=-DBUILD_PYTHON=1 -DDUCKDB_EXTENSION_${EXTENSION_NAME}_SHOULD_LINK=0 | ||
|
|
||
| debug_js: CLIENT_FLAGS=$(JS_BUILD_FLAGS) | ||
| debug_js: debug | ||
| debug_python: CLIENT_FLAGS=$(PY_BUILD_FLAGS) | ||
| debug_python: debug | ||
| release_js: CLIENT_FLAGS=$(JS_BUILD_FLAGS) | ||
| release_js: release | ||
| release_python: CLIENT_FLAGS=$(PY_BUILD_FLAGS) | ||
| release_python: release | ||
|
|
||
| # Main tests | ||
| test: test_release | ||
|
|
||
| test_release: release | ||
| ./build/release/$(TEST_PATH) "$(PROJ_DIR)test/*" | ||
|
|
||
| test_debug: debug | ||
| ./build/debug/$(TEST_PATH) "$(PROJ_DIR)test/*" | ||
|
|
||
| #### Client tests | ||
| DEBUG_EXT_PATH='$(PROJ_DIR)build/debug/extension/spatial/spatial.duckdb_extension' | ||
| RELEASE_EXT_PATH='$(PROJ_DIR)build/release/extension/spatial/spatial.duckdb_extension' | ||
|
|
||
| test_js: test_debug_js | ||
|
|
||
| test_debug_js: debug_js | ||
| cd duckdb/tools/nodejs && ${EXTENSION_NAME}_EXTENSION_BINARY_PATH=$(DEBUG_EXT_PATH) npm run test-path -- "../../../test/nodejs/**/*.js" | ||
|
|
||
| test_release_js: release_js | ||
| cd duckdb/tools/nodejs && ${EXTENSION_NAME}_EXTENSION_BINARY_PATH=$(RELEASE_EXT_PATH) npm run test-path -- "../../../test/nodejs/**/*.js" | ||
|
|
||
| test_python: test_debug_python | ||
|
|
||
| test_debug_python: debug_python | ||
| cd test/python && ${EXTENSION_NAME}_EXTENSION_BINARY_PATH=$(DEBUG_EXT_PATH) python3 -m pytest | ||
|
|
||
| test_release_python: release_python | ||
| cd test/python && ${EXTENSION_NAME}_EXTENSION_BINARY_PATH=$(RELEASE_EXT_PATH) python3 -m pytest | ||
|
|
||
| #### Misc | ||
| format: | ||
| find spatial/src/ -iname *.hpp -o -iname *.cpp | xargs clang-format --sort-includes=0 -style=file -i | ||
| find spatial/include -iname *.hpp -o -iname *.cpp | xargs clang-format --sort-includes=0 -style=file -i | ||
| cmake-format -i spatial/src/CMakeLists.txt | ||
|
|
||
| update: | ||
| git submodule update --remote --merge | ||
|
|
||
| pull: | ||
| git submodule init | ||
| git submodule update --recursive --remote | ||
|
|
||
| clean: | ||
| rm -rf build | ||
| rm -rf testext | ||
| #cd duckdb && make clean | ||
| #cd duckdb && make clean-python | ||
|
|
||
| # WASM config | ||
| VCPKG_EMSDK_FLAGS=-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=$(EMSDK)/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake | ||
| WASM_COMPILE_TIME_COMMON_FLAGS=-DWASM_LOADABLE_EXTENSIONS=1 -DBUILD_EXTENSIONS_ONLY=1 -DSKIP_EXTENSIONS="parquet;json" $(VCPKG_EMSDK_FLAGS) | ||
| WASM_CXX_MVP_FLAGS= | ||
| WASM_CXX_EH_FLAGS=$(WASM_CXX_MVP_FLAGS) -fwasm-exceptions -DWEBDB_FAST_EXCEPTIONS=1 | ||
| WASM_CXX_THREADS_FLAGS=$(WASM_COMPILE_TIME_EH_FLAGS) -DWITH_WASM_THREADS=1 -DWITH_WASM_SIMD=1 -DWITH_WASM_BULK_MEMORY=1 -pthread | ||
| WASM_LINK_TIME_FLAGS=-O3 -sSIDE_MODULE=2 -sEXPORTED_FUNCTIONS="_${EXT_NAME}_version,_${EXT_NAME}_init" | ||
|
|
||
| # WASM targets | ||
| wasm_mvp: | ||
| mkdir -p build/wasm_mvp | ||
| emcmake cmake $(GENERATOR) $(EXTENSION_FLAGS) $(WASM_COMPILE_TIME_COMMON_FLAGS) -Bbuild/wasm_mvp -DCMAKE_CXX_FLAGS="$(WASM_CXX_MVP_FLAGS)" -S $(DUCKDB_SRCDIR) -DDUCKDB_EXPLICIT_PLATFORM=wasm_mvp -DDUCKDB_CUSTOM_PLATFORM=wasm_mvp | ||
| emmake make -j8 -Cbuild/wasm_mvp | ||
|
|
||
| wasm_eh: | ||
| mkdir -p build/wasm_eh | ||
| emcmake cmake $(GENERATOR) $(EXTENSION_FLAGS) $(WASM_COMPILE_TIME_COMMON_FLAGS) -Bbuild/wasm_eh -DCMAKE_CXX_FLAGS="$(WASM_CXX_EH_FLAGS)" -S $(DUCKDB_SRCDIR) -DDUCKDB_EXPLICIT_PLATFORM=wasm_eh -DDUCKDB_CUSTOM_PLATFORM=wasm_eh | ||
| emmake make -j8 -Cbuild/wasm_eh | ||
|
|
||
| wasm_threads: | ||
| mkdir -p ./build/wasm_threads | ||
| emcmake cmake $(GENERATOR) $(EXTENSION_FLAGS) $(WASM_COMPILE_TIME_COMMON_FLAGS) -Bbuild/wasm_threads -DCMAKE_CXX_FLAGS="$(WASM_CXX_THREADS_FLAGS)" -S $(DUCKDB_SRCDIR) -DDUCKDB_EXPLICIT_PLATFORM=wasm_threads -DDUCKDB_CUSTOM_PLATFORM=wasm_threads | ||
| emmake make -j8 -Cbuild/wasm_threads | ||
| # Include the Makefile from extension-ci-tools | ||
| include extension-ci-tools/makefiles/duckdb_extension.Makefile |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule extension-ci-tools
added at
916d4e
Oops, something went wrong.