Skip to content

Commit 73ead79

Browse files
committed
bump duckdb to 1.3
1 parent 6a80b20 commit 73ead79

File tree

4 files changed

+17
-6
lines changed

4 files changed

+17
-6
lines changed

.github/workflows/MainDistributionPipeline.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ jobs:
1616
name: Build extension binaries
1717
uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@6a7a4f24c5999355ab36c0a6835baf891fc9d522
1818
with:
19-
duckdb_version: v1.2.2
20-
ci_tools_version: 6a7a4f24c5999355ab36c0a6835baf891fc9d522
19+
ci_tools_version: 1f00107ca1eaf1691049907296a8aa796d054e6b
20+
duckdb_version: ad1273222186d28b4b351736ed88101044bbe97b
2121
extension_name: vortex
2222
exclude_archs: "wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools;windows_amd64_mingw;windows_amd64;linux_arm64"
2323
extra_toolchains: "rust"
24-
override_ci_tools_repository: spiraldb/extension-ci-tools

CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ project(${TARGET_NAME}_project)
66
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
77
set(CMAKE_CXX_STANDARD 17)
88

9+
# Allow C++20 designator syntax in C++17
10+
add_compile_options(-Wno-c++20-designator)
11+
912
include(FetchContent)
1013
FetchContent_Declare(
1114
Corrosion

Makefile

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,20 @@ PROJ_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
22

33
EXT_NAME=vortex_duckdb
44
EXT_CONFIG=${PROJ_DIR}extension_config.cmake
5-
EXT_FLAGS=-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0 -DOVERRIDE_GIT_DESCRIBE=v1.2.2
5+
EXT_FLAGS=-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0
66

7+
export OVERRIDE_GIT_DESCRIBE=v1.3.0
78
export MACOSX_DEPLOYMENT_TARGET=12.0
8-
export VCPKG_OSX_DEPLOYMENT_TARGET=12.0
99
export VCPKG_FEATURE_FLAGS=-binarycaching
10+
export VCPKG_OSX_DEPLOYMENT_TARGET=12.0
1011
export VCPKG_TOOLCHAIN_PATH := ${PROJ_DIR}vcpkg/scripts/buildsystems/vcpkg.cmake
1112

13+
export BUILD_MAIN_DUCKDB_LIBRARY=0
14+
export DISABLE_BUILTIN_EXTENSIONS=1
15+
16+
# This is not needed on macOS, we don't see a tls error on load there.
17+
ifeq ($(shell uname), Linux)
18+
export CFLAGS=-ftls-model=global-dynamic
19+
endif
20+
1221
include extension-ci-tools/makefiles/duckdb_extension.Makefile

duckdb

0 commit comments

Comments
 (0)