@@ -13,53 +13,49 @@ concurrency:
1313permissions : read-all
1414
1515jobs :
16- build-windows-msvc16 :
16+ build-windows :
17+ strategy :
18+ fail-fast : false
19+ matrix :
20+ include :
21+ - { vs: 16, msvc: 2019 }
22+ - { vs: 17, msvc: 2022 }
23+ - { vs: 18, msvc: 2026 }
1724 secrets : inherit
1825 uses : intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
1926 with :
2027 force-delete : true # guarantees .gitattributes are respected in working dir
2128 runs-on : ' [ "build", "x86_64" ]'
22- artifact-out : build-windows-msvc16
29+ msvc-version : ${{ matrix.msvc }}
30+ artifact-out : build-windows-msvc${{ matrix.vs }}
2331 artifact-path : ./build/install
24- cmd : .github\scripts\build.bat "Visual Studio 16 2019" "Release" '"-DBUILD_EMBREE_FROM_SOURCE=OFF"'
25-
26- test-windows-msvc16 :
27- needs : build-windows-msvc16
28- secrets : inherit
29- uses : intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
30- with :
31- runs-on : ' [ "build", "x86_64" ]'
32- artifact-in : build-windows-msvc16
33- cmd : |
34- .github\scripts\run_tests.bat
35-
36-
37- build-windows-msvc17 :
32+ cmd : .github\scripts\build.bat "Visual Studio ${{ matrix.vs }} ${{ matrix.msvc }}" "Release" '"-DBUILD_EMBREE_FROM_SOURCE=OFF"'
33+
34+ build-windows-source :
35+ strategy :
36+ fail-fast : false
37+ matrix :
38+ include :
39+ - { vs: 17, msvc: 2022 }
40+ - { vs: 18, msvc: 2026 }
3841 secrets : inherit
3942 uses : intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
4043 with :
4144 force-delete : true # guarantees .gitattributes are respected in working dir
4245 runs-on : ' [ "build", "x86_64" ]'
43- artifact-out : build-windows-msvc17
44- artifact-path : ./build/install
45- cmd : .github\scripts\build.bat "Visual Studio 17 2022" "Release" '"-DBUILD_EMBREE_FROM_SOURCE=OFF"'
46-
47- build-windows-msvc17-source :
46+ msvc-version : ${{ matrix.msvc }}
47+ cmd : .github\scripts\build.bat "Visual Studio ${{ matrix.vs }} ${{ matrix.msvc }}" "Release"
48+
49+ test-windows :
50+ needs : build-windows
51+ strategy :
52+ fail-fast : false
53+ matrix :
54+ vs : [16, 17] # TODO 18 when fix of https://developercommunity.visualstudio.com/t/MSVC-x64-O1-miscompiles-size_t-loop-aft/11163646 is released
4855 secrets : inherit
4956 uses : intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
5057 with :
51- force-delete : true # guarantees .gitattributes are respected in working dir
5258 runs-on : ' [ "build", "x86_64" ]'
53- cmd : .github\scripts\build.bat "Visual Studio 17 2022" "Release"
54-
55- test-windows-msvc17 :
56- needs : build-windows-msvc17
57- secrets : inherit
58- uses : intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
59- with :
60- runs-on : ' [ "build", "x86_64" ]'
61- artifact-in : build-windows-msvc17
59+ artifact-in : build-windows-msvc${{ matrix.vs }}
6260 cmd : |
6361 .github\scripts\run_tests.bat
64-
65- # TODO add msvc18, but VC 2026 v18.9 miscompiles
0 commit comments