Merge branch 'dev' into teo/s3-storage-class

TileDB-Inc · Jun 10, 2024 · 2013efc · 2013efc
2 parents 1a1712e + 3bb0699
commit 2013efc
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 2 deletions.
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -61,6 +61,7 @@ jobs:
       TILEDB_WEBP: ${{ matrix.TILEDB_WEBP }}
       TILEDB_CMAKE_BUILD_TYPE: 'Release'
       VCPKG_BINARY_SOURCES: 'clear;x-gha,readwrite'
+      CXXFLAGS: '/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR' # https://github.com/actions/runner-images/issues/10004
     steps:
       - name: 'tiledb env prep'
         run: |

diff --git a/.github/workflows/unit-test-runs.yml b/.github/workflows/unit-test-runs.yml
@@ -10,7 +10,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
+        # Temporarily reverting to windows-2019 until https://github.com/actions/runner-images/issues/10004 gets fixed.
+        os: [macos-latest, ubuntu-latest, windows-2019]
       fail-fast: false
     name: Build - ${{ matrix.os }}
     timeout-minutes: 90
@@ -53,6 +54,11 @@ jobs:
         shell: bash
         if: ${{ !startsWith(matrix.os, 'windows-') }}
 
+      - name: 'Print env'
+        run: set
+        shell: cmd
+        if: ${{ startsWith(matrix.os, 'windows-') }}
+
       - name: 'Build standalone unit tests'
         run: |
           cmake -S . \

diff --git a/ports/triplets/x64-windows-asan.cmake b/ports/triplets/x64-windows-asan.cmake
@@ -7,3 +7,7 @@ set(X_VCPKG_APPLOCAL_DEPS_INSTALL ON)
 # bigobj is needed for capnp.
 set(VCPKG_C_FLAGS "/fsanitize=address /bigobj")
 set(VCPKG_CXX_FLAGS "/fsanitize=address /bigobj")
+
+# https://github.com/actions/runner-images/issues/10004
+set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR")
+set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR")
diff --git a/ports/triplets/x64-windows.cmake b/ports/triplets/x64-windows.cmake
@@ -2,4 +2,8 @@ set(VCPKG_TARGET_ARCHITECTURE x64)
 set(VCPKG_CRT_LINKAGE dynamic)
 set(VCPKG_LIBRARY_LINKAGE static)
 
+# https://github.com/actions/runner-images/issues/10004
+set(VCPKG_C_FLAGS "/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR")
+set(VCPKG_CXX_FLAGS "/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR")
+
 set(X_VCPKG_APPLOCAL_DEPS_INSTALL ON)
diff --git a/test/src/unit-sparse-unordered-with-dups-reader.cc b/test/src/unit-sparse-unordered-with-dups-reader.cc
@@ -1002,7 +1002,7 @@ TEST_CASE_METHOD(
     write_1d_fragment(coords4.data(), &coords4_size, data4.data(), &data4_size);
   }
 
-  total_budget_ = "3000000";
+  total_budget_ = "3300000";
   ratio_array_data_ = "0.002";
   partial_tile_offsets_loading_ =
       enable_partial_tile_offsets_loading ? "true" : "false";