fix windows

Author: wgtmac

.github/workflows/test.yml

@@ -72,8 +72,8 @@ jobs:
         shell: bash
         run: ci/scripts/build_example.sh $(pwd)/example
   windows:
-    name: AMD64 Windows 2019
-    runs-on: windows-2019
+    name: AMD64 Windows 2022
+    runs-on: windows-2022
     timeout-minutes: 30
     steps:
       - name: Checkout iceberg-cpp

ci/scripts/build_example.sh

@@ -25,21 +25,27 @@ build_dir=${1}/build
 mkdir ${build_dir}
 pushd ${build_dir}
 
+is_windows() {
+    [[ "${OSTYPE}" == "msys" || "${OSTYPE}" == "win32" ]]
+}
+
 CMAKE_ARGS=(
     "-DCMAKE_PREFIX_PATH=${CMAKE_INSTALL_PREFIX:-${ICEBERG_HOME}}"
-    "-DCMAKE_BUILD_TYPE=Debug"
 )
 
-BUILD_ARGS=()
-
-# Add Windows-specific toolchain file if on Windows
-if [[ "${OSTYPE}" == "msys" || "${OSTYPE}" == "win32" ]]; then
+if is_windows; then
     CMAKE_ARGS+=("-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake")
-    BUILD_ARGS+=("--config Debug")
+    CMAKE_ARGS+=("-DCMAKE_BUILD_TYPE=Release")
+else
+    CMAKE_ARGS+=("-DCMAKE_BUILD_TYPE=Debug")
 fi
 
 cmake "${CMAKE_ARGS[@]}" ${source_dir}
-cmake --build . "${BUILD_ARGS[@]+"${BUILD_ARGS[@]}"}"
+if is_windows; then
+  cmake --build . --config Release
+else
+  cmake --build .
+fi
 
 popd
 

ci/scripts/build_iceberg.sh

@@ -25,24 +25,31 @@ build_dir=${1}/build
 mkdir ${build_dir}
 pushd ${build_dir}
 
+is_windows() {
+    [[ "${OSTYPE}" == "msys" || "${OSTYPE}" == "win32" ]]
+}
+
 CMAKE_ARGS=(
     "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX:-${ICEBERG_HOME}}"
     "-DICEBERG_BUILD_STATIC=ON"
     "-DICEBERG_BUILD_SHARED=ON"
-    "-DCMAKE_BUILD_TYPE=Debug"
 )
 
-BUILD_ARGS=()
-
-# Add Windows-specific toolchain file if on Windows
-if [[ "${OSTYPE}" == "msys" || "${OSTYPE}" == "win32" ]]; then
+if is_windows; then
     CMAKE_ARGS+=("-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake")
-    BUILD_ARGS+=("--config Debug")
+    CMAKE_ARGS+=("-DCMAKE_BUILD_TYPE=Release")
+else
+    CMAKE_ARGS+=("-DCMAKE_BUILD_TYPE=Debug")
 fi
 
 cmake "${CMAKE_ARGS[@]}" ${source_dir}
-cmake --build . "${BUILD_ARGS[@]+"${BUILD_ARGS[@]}"}" --target install
-ctest --output-on-failure -C Debug
+if is_windows; then
+  cmake --build . --config Release --target install
+  ctest --output-on-failure -C Release
+else
+  cmake --build . --target install
+  ctest --output-on-failure
+fi
 
 popd