Skip to content

Conversation

carlopi
Copy link
Contributor

@carlopi carlopi commented Jul 10, 2025

Two not so independent changes:

set(CMAKE_CXX_WINDOWS_FLAGS
      "${CMAKE_CXX_WINDOWS_FLAGS} /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR")

to vcpkg-cmake port.

If Windows CI for this PR passes, then good to be merged.

@carlopi carlopi changed the title Bump vcpkg duckdb ports and test extensions win10 Bump vcpkg duckdb ports and test extensions on Windows 10 default stdlib Jul 10, 2025
@carlopi carlopi changed the title Bump vcpkg duckdb ports and test extensions on Windows 10 default stdlib Bump vcpkg-duckdb-ports and test extensions on Windows 10 default stdlib Jul 10, 2025
carlopi and others added 3 commits July 15, 2025 01:54
This change enbales additional run of the test suite for all extensions
using C++ stdlib DLL from Visual Studion 2019. This is done to check
the compatibility with older versions of C++ stdlib introduced in duckdb#17991

New workflow step is only run for `x64-windows-static-md` build arch.

Testing: it was checked in manual CI runs, that added unit test run
actually causes a crash when `_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR` is
not used.
@carlopi carlopi force-pushed the bump_vcpkg_duckdb_ports_and_test_extensions_win10 branch from 9f47123 to aab1858 Compare July 14, 2025 23:57
@duckdb-draftbot duckdb-draftbot marked this pull request as draft July 14, 2025 23:57
@carlopi carlopi marked this pull request as ready for review July 14, 2025 23:58
@carlopi
Copy link
Contributor Author

carlopi commented Jul 15, 2025

@staticlibs: I think this includes your PR and roll in relevant fixes (at the moment via vcpkg-duckdb-ports), I think this should fix the Windows 10 issues on building extensions from duckdb/duckdb, as shown by the fact that this passes CI while the PR simply introducing the check does (as expected) fail

I think this is ready to go, and #18149 can then be closed, what do you think?

@staticlibs
Copy link
Contributor

@carlopi

I think this is ready to go, and #18149 can then be closed, what do you think?

Yes, all the testing changes here look good to me! I've closed 18149 in favour of this one.

@carlopi carlopi force-pushed the bump_vcpkg_duckdb_ports_and_test_extensions_win10 branch from aab1858 to 7f6f606 Compare July 15, 2025 07:39
@duckdb-draftbot duckdb-draftbot marked this pull request as draft July 15, 2025 07:39
@carlopi carlopi marked this pull request as ready for review July 15, 2025 07:39
@carlopi
Copy link
Contributor Author

carlopi commented Jul 15, 2025

This should be good to go pending CI.

@carlopi
Copy link
Contributor Author

carlopi commented Jul 15, 2025

This aims to fix 3 known issues all connected with controlling CMake environment for vcpkg dependencies:

  • OSX extensions to be compatible with OSX 11.0
  • Windows extensions to be compatible with Windows 10
  • Wasm extensions to be compiled with -fPIC

Fixes are all rolled in via https://github.com/duckdb/vcpkg-duckdb-ports/blob/main/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake#L11, that is now the way to override CMake behaviour.

We might revisit this to move within extension-ci-tools (in the 1.4.0 run-up), but this does provide a way forward.

@Mytherin Mytherin merged commit 5ad5892 into duckdb:v1.3-ossivalis Jul 15, 2025
55 checks passed
@Mytherin
Copy link
Collaborator

Thanks!

@carlopi carlopi deleted the bump_vcpkg_duckdb_ports_and_test_extensions_win10 branch July 15, 2025 11:27
github-actions bot pushed a commit to duckdb/duckdb-r that referenced this pull request Jul 17, 2025
backport 'Unit Tester Configuration' pt2 (duckdb/duckdb#18282)
Bump vcpkg-duckdb-ports to solve OSX linking (duckdb/duckdb#18268)
Move aarch64 / arm64 to native github runner (duckdb/duckdb#18269)
[Fix] Adjust test for smaller block sizes (duckdb/duckdb#18255)
Bump vcpkg-duckdb-ports and test extensions on Windows 10 default stdlib (duckdb/duckdb#18205)
github-actions bot added a commit to duckdb/duckdb-r that referenced this pull request Jul 17, 2025
backport 'Unit Tester Configuration' pt2 (duckdb/duckdb#18282)
Bump vcpkg-duckdb-ports to solve OSX linking (duckdb/duckdb#18268)
Move aarch64 / arm64 to native github runner (duckdb/duckdb#18269)
[Fix] Adjust test for smaller block sizes (duckdb/duckdb#18255)
Bump vcpkg-duckdb-ports and test extensions on Windows 10 default stdlib (duckdb/duckdb#18205)

Co-authored-by: krlmlr <krlmlr@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants