Skip to content

Commit

Permalink
Merge branch 'main' into install-extension-version-merged
Browse files Browse the repository at this point in the history
  • Loading branch information
samansmink committed May 19, 2024
2 parents 0ed81d0 + 00f3c4c commit 529759a
Show file tree
Hide file tree
Showing 432 changed files with 13,020 additions and 4,973 deletions.
2 changes: 1 addition & 1 deletion .github/actions/build_extensions/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ runs:
run: |
mkdir overlay_triplets
cp $OVERLAY_TRIPLET_SRC $OVERLAY_TRIPLET_DST
echo "set(VCPKG_PLATFORM_TOOLSET_VERSION "14.38")" >> $OVERLAY_TRIPLET_DST
echo "set(VCPKG_PLATFORM_TOOLSET_VERSION "14.39")" >> $OVERLAY_TRIPLET_DST
- name: Set Openssl dir
if: inputs.openssl_path != ''
Expand Down
2 changes: 1 addition & 1 deletion .github/config/extensions.csv
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ aws,https://github.com/duckdb/duckdb_aws,f7b8729f1cce5ada5d4add70e1486de50763fb9
azure,https://github.com/duckdb/duckdb_azure,09623777a366572bfb8fa53e47acdf72133a360e,
spatial,https://github.com/duckdb/duckdb_spatial,8ac803e986ccda34f32dee82a7faae95b72b3492,
iceberg,https://github.com/duckdb/duckdb_iceberg,d89423c2ff90a0b98a093a133c8dfe2a55b9e092,
vss,https://github.com/duckdb/duckdb_vss,8145f41d97178e82bed3376215eb8d02bcf1eec5,
vss,https://github.com/duckdb/duckdb_vss,dbf5b74298384a9dc8e78353e628259b020cd4eb,
20 changes: 8 additions & 12 deletions .github/config/out_of_tree_extensions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ if (NOT MINGW)
duckdb_extension_load(aws
LOAD_TESTS
GIT_URL https://github.com/duckdb/duckdb_aws
GIT_TAG f7b8729f1cce5ada5d4add70e1486de50763fb97
APPLY_PATCHES
GIT_TAG 42c78d3f99e1a188a2b178ea59e3c17907af4fb2
)
endif()

Expand All @@ -40,8 +39,7 @@ if (NOT MINGW)
duckdb_extension_load(azure
LOAD_TESTS
GIT_URL https://github.com/duckdb/duckdb_azure
GIT_TAG 09623777a366572bfb8fa53e47acdf72133a360e
APPLY_PATCHES
GIT_TAG 49b63dc8cd166952a0a34dfd54e6cfe5b823e05e
)
endif()

Expand All @@ -57,7 +55,7 @@ if (NOT MINGW)
duckdb_extension_load(iceberg
${LOAD_ICEBERG_TESTS}
GIT_URL https://github.com/duckdb/duckdb_iceberg
GIT_TAG d89423c2ff90a0b98a093a133c8dfe2a55b9e092
GIT_TAG fe0471671924ce57308924c79f72efd18103e66b
)
endif()

Expand All @@ -68,8 +66,7 @@ if (NOT MINGW)
duckdb_extension_load(postgres_scanner
DONT_LINK
GIT_URL https://github.com/duckdb/postgres_scanner
GIT_TAG 96206f41d5ca7015920a66b54e936c986fe0b0f8
APPLY_PATCHES
GIT_TAG 120c0b12258d27758e240d61f5dc22a4238a14a6
)
endif()

Expand All @@ -94,8 +91,7 @@ endif()
duckdb_extension_load(sqlite_scanner
${STATIC_LINK_SQLITE} LOAD_TESTS
GIT_URL https://github.com/duckdb/sqlite_scanner
GIT_TAG 091197efb34579c7195afa43dfb5925023c915c0
APPLY_PATCHES
GIT_TAG 50b7870be099186f195bc72bac5e9e11247ee2f9
)

################# SUBSTRAIT
Expand All @@ -112,8 +108,9 @@ endif()
################# VSS
duckdb_extension_load(vss
LOAD_TESTS
DONT_LINK
GIT_URL https://github.com/duckdb/duckdb_vss
GIT_TAG 8145f41d97178e82bed3376215eb8d02bcf1eec5
GIT_TAG dbf5b74298384a9dc8e78353e628259b020cd4eb
TEST_DIR test/sql
APPLY_PATCHES
)
Expand All @@ -124,7 +121,6 @@ if (NOT MINGW)
DONT_LINK
LOAD_TESTS
GIT_URL https://github.com/duckdb/duckdb_mysql
GIT_TAG 655a003f7d405e0c8437e24e0bd47dfd63b7fb07
APPLY_PATCHES
GIT_TAG 4dd5963cc5f7f04f81a0ea308b104e65791d9975
)
endif()
53 changes: 0 additions & 53 deletions .github/patches/extensions/aws/0001-update-tests.patch

This file was deleted.

37 changes: 0 additions & 37 deletions .github/patches/extensions/aws/shared_ptr.patch

This file was deleted.

Loading

0 comments on commit 529759a

Please sign in to comment.