Add Win10 vs. Win8 GHA

microsoft · Nov 9, 2024 · 6e7529c · 6e7529c
1 parent 0455bec
commit 6e7529c
Show file tree

Hide file tree

Showing 3 changed files with 111 additions and 27 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -3,7 +3,7 @@
 #
 # http://go.microsoft.com/fwlink/?LinkId=248929
 
-name: 'CMake (Windows)'
+name: 'CMake (Windows 8)'
 
 on:
   push:
@@ -48,18 +48,6 @@ jobs:
           - os: windows-2022
             build_type: x86-Release
             arch: amd64_x86
-          - os: windows-2022
-            build_type: arm64-Debug
-            arch: amd64_arm64
-          - os: windows-2022
-            build_type: arm64-Release
-            arch: amd64_arm64
-          - os: windows-2022
-            build_type: arm64ec-Debug
-            arch: amd64_arm64
-          - os: windows-2022
-            build_type: arm64ec-Release
-            arch: amd64_arm64
           - os: windows-2022
             build_type: x64-Debug-Clang
             arch: amd64
@@ -72,12 +60,6 @@ jobs:
           - os: windows-2022
             build_type: x86-Release-Clang
             arch: amd64_x86
-          - os: windows-2022
-            build_type: arm64-Debug-Clang
-            arch: amd64_arm64
-          - os: windows-2022
-            build_type: arm64-Release-Clang
-            arch: amd64_arm64
 
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -97,12 +79,10 @@ jobs:
       working-directory: ${{ github.workspace }}
       run: cmake --build out\build\${{ matrix.build_type }}
 
-    - if: matrix.arch != 'amd64_arm64'
-      name: 'Configure CMake (Spectre)'
+    - name: 'Configure CMake (Spectre)'
       working-directory: ${{ github.workspace }}
       run: cmake --preset=${{ matrix.build_type }} -DENABLE_SPECTRE_MITIGATION=ON
 
-    - if: matrix.arch != 'amd64_arm64'
-      name: 'Build (Spectre)'
+    - name: 'Build (Spectre)'
       working-directory: ${{ github.workspace }}
       run: cmake --build out\build\${{ matrix.build_type }}
diff --git a/.github/workflows/win10.yml b/.github/workflows/win10.yml
@@ -0,0 +1,108 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+#
+# http://go.microsoft.com/fwlink/?LinkId=248929
+
+name: 'CMake (Windows 10/Windows 11)'
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+    paths-ignore:
+      - '*.md'
+      - LICENSE
+      - '.nuget/*'
+      - build/*.cmd
+      - build/*.json
+      - build/*.props
+      - build/*.ps1
+      - build/*.targets
+      - build/*.yml
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+
+      matrix:
+        os: [windows-2019, windows-2022]
+        build_type: [x64-Debug-Win10, x64-Release-Win10]
+        arch: [amd64]
+        include:
+          - os: windows-2019
+            build_type: x86-Debug-Win10
+            arch: amd64_x86
+          - os: windows-2019
+            build_type: x86-Release-Win10
+            arch: amd64_x86
+          - os: windows-2022
+            build_type: x86-Debug-Win10
+            arch: amd64_x86
+          - os: windows-2022
+            build_type: x86-Release-Win10
+            arch: amd64_x86
+          - os: windows-2022
+            build_type: arm64-Debug
+            arch: amd64_arm64
+          - os: windows-2022
+            build_type: arm64-Release
+            arch: amd64_arm64
+          - os: windows-2022
+            build_type: arm64ec-Debug
+            arch: amd64_arm64
+          - os: windows-2022
+            build_type: arm64ec-Release
+            arch: amd64_arm64
+          - os: windows-2022
+            build_type: x64-Debug-Win10-Clang
+            arch: amd64
+          - os: windows-2022
+            build_type: x64-Release-Win10-Clang
+            arch: amd64
+          - os: windows-2022
+            build_type: x86-Debug-Win10-Clang
+            arch: amd64_x86
+          - os: windows-2022
+            build_type: x86-Release-Win10-Clang
+            arch: amd64_x86
+          - os: windows-2022
+            build_type: arm64-Debug-Clang
+            arch: amd64_arm64
+          - os: windows-2022
+            build_type: arm64-Release-Clang
+            arch: amd64_arm64
+
+    steps:
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+    - name: 'Install Ninja'
+      run: choco install ninja
+
+    - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
+      with:
+        arch: ${{ matrix.arch }}
+
+    - name: 'Configure CMake'
+      working-directory: ${{ github.workspace }}
+      run: cmake --preset=${{ matrix.build_type }}
+
+    - name: 'Build'
+      working-directory: ${{ github.workspace }}
+      run: cmake --build out\build\${{ matrix.build_type }}
+
+    - if: matrix.arch != 'amd64_arm64'
+      name: 'Configure CMake (Spectre)'
+      working-directory: ${{ github.workspace }}
+      run: cmake --preset=${{ matrix.build_type }} -DENABLE_SPECTRE_MITIGATION=ON
+
+    - if: matrix.arch != 'amd64_arm64'
+      name: 'Build (Spectre)'
+      working-directory: ${{ github.workspace }}
+      run: cmake --build out\build\${{ matrix.build_type }}
diff --git a/build/vcpkg.json b/build/vcpkg.json
@@ -2,10 +2,6 @@
     "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
     "dependencies": [
       "directxmath",
-      {
-        "name": "directx-dxc",
-        "host": true
-      },
       "directx-headers",
       {
         "name": "xaudio2redist",