update

Author: Changming Sun

.github/workflows/reusable_windows_build.yml

@@ -6,6 +6,9 @@ on:
       job-name: # For display purposes in the reusable workflow logs
         required: true
         type: string
+      runner-os: # New input for the runner OS
+        required: true
+        type: string
       cmake-workflow-preset:
         required: true
         type: string
@@ -25,16 +28,13 @@ on:
 permissions:
   actions: read
   contents: read
-  # security-events: write is needed only if CodeQL is enabled and uploads SARIF
-  # We'll set it at the job level within this reusable workflow for clarity.
+  security-events: write # Needed if CodeQL analysis runs & uploads
 
 jobs:
   build_and_optional_analyze:
     name: ${{ inputs.job-name }}
-    runs-on: windows-2022
-    # Define permissions here based on whether CodeQL might run.
-    # If enable-codeql can be true, then security-events: write is needed.
-    permissions:
+    runs-on: ${{ inputs.runner-os }} # Use the input for runs-on
+    permissions: # Permissions moved here as they are job-specific
       actions: read
       contents: read
       security-events: write # Needed if CodeQL analysis runs & uploads
@@ -53,15 +53,15 @@ jobs:
       - name: Run CMake Workflow
         run: |
           cmake --workflow --preset ${{ inputs.cmake-workflow-preset }}
-        shell: cmd # Ensuring shell is explicit for windows runners if needed
+        shell: cmd 
 
       - name: Perform CodeQL Analysis (if enabled)
         if: ${{ inputs.enable-codeql }}
         uses: github/codeql-action/analyze@v3
         with:
-          category: "/language:cpp" # Category for the analysis
-          output: ${{ inputs.codeql-sarif-output-dir }} # Directory for SARIF files
-          upload: failure-only # Upload SARIF results only on failure
+          category: "/language:cpp" 
+          output: ${{ inputs.codeql-sarif-output-dir }} 
+          upload: failure-only 
 
       - name: Filter SARIF (if CodeQL enabled)
         if: ${{ inputs.enable-codeql }}
@@ -73,11 +73,11 @@ jobs:
             -tests/**/*.*
             -build/**/*.*
           input: ${{ inputs.codeql-sarif-output-dir }}/cpp.sarif
-          output: ${{ inputs.codeql-sarif-output-dir }}/cpp.sarif.filtered # Output to a new file
+          output: ${{ inputs.codeql-sarif-output-dir }}/cpp.sarif.filtered 
 
       - name: Upload filtered SARIF (if CodeQL enabled)
         if: ${{ inputs.enable-codeql }}
         uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: ${{ inputs.codeql-sarif-output-dir }}/cpp.sarif.filtered
-          category: cpp-${{ inputs.job-name }} # Make category unique if needed
+          category: cpp-${{ inputs.job-name }}

.github/workflows/win_ci.yml

@@ -8,7 +8,7 @@ on:
   pull_request:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.ref || github.sha }}
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -17,14 +17,15 @@ jobs:
     uses: ./.github/workflows/reusable_windows_build.yml
     with:
       job-name: Win32_Debug_NoOrt_CodeQL
+      runner-os: windows-2022
       cmake-workflow-preset: windows_win32_debug_no_ort_workflow
       enable-codeql: true
-      # codeql-config-file can be omitted if default is fine
 
   Win32_release_no_ort:
     uses: ./.github/workflows/reusable_windows_build.yml
     with:
       job-name: Win32_Release_NoOrt
+      runner-os: windows-2022
       cmake-workflow-preset: windows_win32_release_no_ort_workflow
       enable-codeql: false
 
@@ -33,41 +34,39 @@ jobs:
     uses: ./.github/workflows/reusable_windows_build.yml
     with:
       job-name: Winx64_Debug_NoOrt_CodeQL
+      runner-os: windows-2022
       cmake-workflow-preset: windows_x64_debug_no_ort_workflow
       enable-codeql: true
 
   WinX64_release_no_ort:
     uses: ./.github/workflows/reusable_windows_build.yml
     with:
       job-name: Winx64_Release_NoOrt
+      runner-os: windows-2022
       cmake-workflow-preset: windows_x64_release_no_ort_workflow
       enable-codeql: false
-
+      
   WinX64_release:
     uses: ./.github/workflows/reusable_windows_build.yml
     with:
       job-name: Winx64_Release
+      runner-os: windows-2022
       cmake-workflow-preset: windows_x64_release_workflow
       enable-codeql: false
 
-  # Windows ARM64 Jobs (New)
+  # Windows ARM64 Jobs
   WinARM64_debug_no_ort:
     uses: ./.github/workflows/reusable_windows_build.yml
     with:
       job-name: WinARM64_Debug_NoOrt_CodeQL
-      cmake-workflow-preset: windows_arm64_debug_no_ort_workflow # Ensure this preset exists
+      runner-os: windows-11-arm # Use ARM64 runner
+      cmake-workflow-preset: windows_arm64_debug_no_ort_workflow 
       enable-codeql: true
 
-  WinARM64_release_no_ort:
-    uses: ./.github/workflows/reusable_windows_build.yml
-    with:
-      job-name: WinARM64_Release_NoOrt
-      cmake-workflow-preset: windows_arm64_release_no_ort_workflow # Ensure this preset exists
-      enable-codeql: false
-
   WinARM64_release:
     uses: ./.github/workflows/reusable_windows_build.yml
     with:
       job-name: WinARM64_Release
-      cmake-workflow-preset: windows_arm64_release_workflow # Ensure this preset exists
-      enable-codeql: false
+      runner-os: windows-11-arm # Use ARM64 runner
+      cmake-workflow-preset: windows_arm64_release_workflow 
+      enable-codeql: false