From 488053ff05b6b39e3746255ae95b7bd6b8574a9e Mon Sep 17 00:00:00 2001
From: Dongjoon Hyun <dongjoon@apache.org>
Date: Tue, 17 Jun 2025 13:20:03 -0700
Subject: [PATCH 1/4] Test Windows 2025

---
 .github/workflows/build_and_test.yml | 31 ++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 750dec550c..994d13821c 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -114,6 +114,37 @@ jobs:
       run: |
         cat /home/runner/work/orc/orc/build/java/rat.txt
 
+  windows:
+    name: "C++ ${{ matrix.simd }} Test on Windows"
+    runs-on: windows-2025
+    strategy:
+      fail-fast: false
+      matrix:
+        simd:
+          - General
+          - AVX512
+    env:
+      ORC_USER_SIMD_LEVEL: AVX512
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+    - name: Add msbuild to PATH
+      uses: microsoft/setup-msbuild@v1.1
+      with:
+        msbuild-architecture: x64
+    - name: "Test"
+      shell: bash
+      run: |
+        mkdir build
+        cd build
+        if [ "${{ matrix.simd }}" = "General" ]; then
+          cmake .. -G "Visual Studio 16 2019" -DCMAKE_BUILD_TYPE=Debug -DBUILD_LIBHDFSPP=OFF -DBUILD_TOOLS=OFF -DBUILD_JAVA=OFF
+        else
+          cmake .. -G "Visual Studio 16 2019" -DCMAKE_BUILD_TYPE=Debug -DBUILD_LIBHDFSPP=OFF -DBUILD_TOOLS=OFF -DBUILD_JAVA=OFF -DBUILD_ENABLE_AVX512=ON
+        fi
+        cmake --build . --config Debug
+        ctest -C Debug --output-on-failure
+
   simdUbuntu:
     name: "SIMD programming using C++ intrinsic functions on ${{ matrix.os }}"
     runs-on: ${{ matrix.os }}

From f0175ccd95e742dddedd7797fb20388a10d35f7b Mon Sep 17 00:00:00 2001
From: Dongjoon Hyun <dongjoon@apache.org>
Date: Tue, 17 Jun 2025 13:28:07 -0700
Subject: [PATCH 2/4] Visual Studio 17 2022

---
 .github/workflows/build_and_test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 994d13821c..7f46aa10b8 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -138,9 +138,9 @@ jobs:
         mkdir build
         cd build
         if [ "${{ matrix.simd }}" = "General" ]; then
-          cmake .. -G "Visual Studio 16 2019" -DCMAKE_BUILD_TYPE=Debug -DBUILD_LIBHDFSPP=OFF -DBUILD_TOOLS=OFF -DBUILD_JAVA=OFF
+          cmake .. -G "Visual Studio 17 2022" -DCMAKE_BUILD_TYPE=Debug -DBUILD_LIBHDFSPP=OFF -DBUILD_TOOLS=OFF -DBUILD_JAVA=OFF
         else
-          cmake .. -G "Visual Studio 16 2019" -DCMAKE_BUILD_TYPE=Debug -DBUILD_LIBHDFSPP=OFF -DBUILD_TOOLS=OFF -DBUILD_JAVA=OFF -DBUILD_ENABLE_AVX512=ON
+          cmake .. -G "Visual Studio 17 2022" -DCMAKE_BUILD_TYPE=Debug -DBUILD_LIBHDFSPP=OFF -DBUILD_TOOLS=OFF -DBUILD_JAVA=OFF -DBUILD_ENABLE_AVX512=ON
         fi
         cmake --build . --config Debug
         ctest -C Debug --output-on-failure

From 6971241207495b2d7e02b0aa979fb1e41e63fa43 Mon Sep 17 00:00:00 2001
From: Dongjoon Hyun <dongjoon@apache.org>
Date: Tue, 17 Jun 2025 13:33:58 -0700
Subject: [PATCH 3/4] Use release build

---
 .github/workflows/build_and_test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 7f46aa10b8..e0568305fe 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -138,9 +138,9 @@ jobs:
         mkdir build
         cd build
         if [ "${{ matrix.simd }}" = "General" ]; then
-          cmake .. -G "Visual Studio 17 2022" -DCMAKE_BUILD_TYPE=Debug -DBUILD_LIBHDFSPP=OFF -DBUILD_TOOLS=OFF -DBUILD_JAVA=OFF
+          cmake .. -G "Visual Studio 17 2022" -DCMAKE_BUILD_TYPE=RELEASE -DBUILD_LIBHDFSPP=OFF -DBUILD_TOOLS=OFF -DBUILD_JAVA=OFF
         else
-          cmake .. -G "Visual Studio 17 2022" -DCMAKE_BUILD_TYPE=Debug -DBUILD_LIBHDFSPP=OFF -DBUILD_TOOLS=OFF -DBUILD_JAVA=OFF -DBUILD_ENABLE_AVX512=ON
+          cmake .. -G "Visual Studio 17 2022" -DCMAKE_BUILD_TYPE=RELEASE -DBUILD_LIBHDFSPP=OFF -DBUILD_TOOLS=OFF -DBUILD_JAVA=OFF -DBUILD_ENABLE_AVX512=ON
         fi
         cmake --build . --config Debug
         ctest -C Debug --output-on-failure

From 16ee0bdbdf6f7fc5e7a6fdaf56f3b677d5619210 Mon Sep 17 00:00:00 2001
From: Gang Wu <ustcwg@gmail.com>
Date: Wed, 6 Aug 2025 23:57:11 +0800
Subject: [PATCH 4/4] modify c++ file to trigger ci

---
 c++/include/orc/BloomFilter.hh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/c++/include/orc/BloomFilter.hh b/c++/include/orc/BloomFilter.hh
index d08f6deac7..bcc8bf4d7a 100644
--- a/c++/include/orc/BloomFilter.hh
+++ b/c++/include/orc/BloomFilter.hh
@@ -19,8 +19,6 @@
 #ifndef ORC_BLOOMFILTER_HH
 #define ORC_BLOOMFILTER_HH
 
-#include "orc/orc-config.hh"
-
 #include <memory>
 #include <vector>