Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitbbdc794

Browse files
authored
Merge v1.2.2 into main (#17037)
This brings in the latest changes in `v1.2-histrionicus` into `main`.The more complex bit was merging `.github/config/out_of_tree.cmake`,that is still likely will not really compile due to patches beingapplied to different commits.Four regressions:* httpfs had sha c22532453e9fab8404f91729708d9f35e23d323d in `v1.2.2`,rolling back a few commits to `85ac4667bcb0d868199e156f8dd918b0278db7b9`due to changes in Secret interface* `avro` is currently disabled, needs a patch and re-enabling* `delta` is currently disabled, needs a different set of patches andre-enabling* `aws` tests are currently skippedAnd an unrelated change, that was needed due to incompatibility:* bump spatial and remove the patchThere are relevant issues to solve them and can be handled piece bypiece.
2 parents5141aa4 +7997d80 commitbbdc794

File tree

23 files changed

+218
-316
lines changed

23 files changed

+218
-316
lines changed

‎.github/actions/build_extensions/action.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,6 @@ inputs:
8888
description:'Flags to be passed to cmake'
8989
default:''
9090

91-
env:
92-
CMAKE_POLICY_VERSION_MINIMUM:3.5
93-
9491
runs:
9592
using:"composite"
9693
steps:

‎.github/actions/build_extensions_dockerized/action.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ runs:
5959
echo "OPENSSL_DIR=/duckdb_build_dir/build/release/vcpkg_installed/${{ inputs.vcpkg_target_triplet }}" >> docker_env.txt
6060
echo "OPENSSL_USE_STATIC_LIBS=true" >> docker_env.txt
6161
echo "DUCKDB_PLATFORM=${{ inputs.duckdb_arch }}" >> docker_env.txt
62-
echo "CMAKE_POLICY_VERSION_MINIMUM=3.5" >> docker_env.txt
6362
echo "OVERRIDE_GIT_DESCRIBE=${{ inputs.override_git_describe }}" >> docker_env.txt
6463
echo "LINUX_CI_IN_DOCKER=1" >> docker_env.txt
6564
echo "TOOLCHAIN_FLAGS=${{ inputs.duckdb_arch == 'linux_arm64' && '-DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc -DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++ -DCMAKE_Fortran_COMPILER=aarch64-linux-gnu-gfortran' || '' }}" >> docker_env.txt

‎.github/config/out_of_tree_extensions.cmake‎

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,24 @@ duckdb_extension_load(httpfs
2828
INCLUDE_DIR extension/httpfs/include
2929
)
3030

31+
### Skip due to missing patch
32+
if(FALSE)
33+
################# AVRO
34+
if (NOT MINGW)
35+
duckdb_extension_load(avro
36+
LOAD_TESTS DONT_LINK
37+
GIT_URL https://github.com/duckdb/duckdb-avro
38+
GIT_TAG ed18629fa56a97e0796a3582110b51ddd125159d
39+
)
40+
endif()
41+
endif()
42+
3143
################## AWS
3244
if (NOT MINGWANDNOT${WASM_ENABLED})
3345
duckdb_extension_load(aws
34-
LOAD_TESTS
46+
### TODO: re-enableLOAD_TESTS
3547
GIT_URL https://github.com/duckdb/duckdb-aws
36-
GIT_TAGb3050f35c6e99fa35465230493eeab14a78a0409
48+
GIT_TAGe92e45b30ba17594b1101db22699a2244adfaeb1
3749
APPLY_PATCHES
3850
)
3951
endif()
@@ -43,7 +55,7 @@ if (NOT MINGW AND NOT ${WASM_ENABLED})
4355
duckdb_extension_load(azure
4456
LOAD_TESTS
4557
GIT_URL https://github.com/duckdb/duckdb-azure
46-
GIT_TAGe707cf361d76358743969cddf3acf97cfc87677b
58+
GIT_TAG1593cb56745a51eb7d8415c1fd7d11a15f20f413
4759
)
4860
endif()
4961

@@ -54,6 +66,7 @@ if (FALSE)
5466
if (NOT MINGWANDNOT"${OS_NAME}"STREQUAL"linux"ANDNOT${WASM_ENABLED})
5567
duckdb_extension_load(delta
5668
GIT_URL https://github.com/duckdb/duckdb-delta
69+
## TODO: GIT_TAG 90f244b3d572c1692867950b562df8183957b7a8
5770
GIT_TAG 6d626173e9efa6615c25eb08d979d1372100d5db
5871
APPLY_PATCHES
5972
)
@@ -64,14 +77,13 @@ endif()
6477
duckdb_extension_load(excel
6578
LOAD_TESTS
6679
GIT_URL https://github.com/duckdb/duckdb-excel
67-
GIT_TAGf14e7c3beaf379c54b47b996aa896a1d814e1be8
80+
GIT_TAGb724b308b2b3a3c5644272cc84ec140fbcc7617d
6881
INCLUDE_DIR src/excel/include
6982
)
7083

7184
################# ICEBERG
7285
# Windows tests for iceberg currently not working
73-
if(FALSE)
74-
if (NOTWIN32)
86+
IF (NOTWIN32)
7587
set(LOAD_ICEBERG_TESTS"LOAD_TESTS")
7688
else ()
7789
set(LOAD_ICEBERG_TESTS"")
@@ -81,10 +93,9 @@ if (NOT MINGW AND NOT ${WASM_ENABLED} AND NOT ${MUSL_ENABLED})
8193
duckdb_extension_load(iceberg
8294
# ${LOAD_ICEBERG_TESTS} TODO: re-enable once autoloading test is fixed
8395
GIT_URL https://github.com/duckdb/duckdb-iceberg
84-
GIT_TAG43b4e37f6e859d6c1c67b787ac511659e9e0b6fb
96+
GIT_TAG2db98c685f67373b347c3a8c435ef2e01c509697
8597
)
8698
endif()
87-
endif()
8899

89100
################# INET
90101
duckdb_extension_load(inet
@@ -103,7 +114,7 @@ if (NOT MINGW AND NOT ${WASM_ENABLED})
103114
duckdb_extension_load(postgres_scanner
104115
DONT_LINK
105116
GIT_URL https://github.com/duckdb/duckdb-postgres
106-
GIT_TAG8461ed8b6f726564934e9c831cdc88d431e3148f
117+
GIT_TAG98482ce5c144287f01e738275892cdb84ea9b5ce
107118
APPLY_PATCHES
108119
)
109120
endif()
@@ -114,10 +125,9 @@ if (NOT MINGW)
114125
duckdb_extension_load(spatial
115126
DONT_LINK LOAD_TESTS
116127
GIT_URL https://github.com/duckdb/duckdb-spatial
117-
GIT_TAG2905968a85703e5ca3698976daafd759554e1744
128+
GIT_TAG4be6065edc313a53ff2196ff79c11a0d5e249720
118129
INCLUDE_DIR spatial/include
119130
TEST_DIRtest/sql
120-
APPLY_PATCHES
121131
)
122132
endif()
123133

@@ -132,7 +142,7 @@ endif()
132142
duckdb_extension_load(sqlite_scanner
133143
${STATIC_LINK_SQLITE} LOAD_TESTS
134144
GIT_URL https://github.com/duckdb/duckdb-sqlite
135-
GIT_TAG96e451c043afa40ee39b7581009ba0c72a523a12
145+
GIT_TAG66a5fa2448398379dc21c18308e3b95d42d84015
136146
APPLY_PATCHES
137147
)
138148

@@ -147,7 +157,7 @@ duckdb_extension_load(vss
147157
LOAD_TESTS
148158
DONT_LINK
149159
GIT_URL https://github.com/duckdb/duckdb-vss
150-
GIT_TAG580e8918eb89f478cf2d233ca908ffbd3ec752c5
160+
GIT_TAGba199a7215b75e83821ece13f6b921ccfcebd6ac
151161
TEST_DIRtest/sql
152162
APPLY_PATCHES
153163
)
@@ -158,7 +168,7 @@ if (NOT MINGW AND NOT ${WASM_ENABLED} AND NOT ${MUSL_ENABLED})
158168
DONT_LINK
159169
LOAD_TESTS
160170
GIT_URL https://github.com/duckdb/duckdb-mysql
161-
GIT_TAGc2a56813a9fe9cb8c24c424be646d41ab2f8e64f
171+
GIT_TAG93469fc39a317acf916627e0ddc724a076bf7302
162172
APPLY_PATCHES
163173
)
164174
endif()

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp