|
71 | 71 | cmd /c "$env:VSDevCmd" "&" msbuild /m /clp:ForceConsoleColor "$env:msbuild_config_props" cppwinrt.sln /t:cppwinrt
|
72 | 72 |
|
73 | 73 | - name: Upload built executables
|
74 |
| - uses: actions/upload-artifact@v3 |
| 74 | + uses: actions/upload-artifact@v4 |
75 | 75 | with:
|
76 |
| - name: msvc-build-${{ matrix.arch }}-${{ matrix.config }}-bin |
| 76 | + name: msvc-build-${{ matrix.compiler}}-${{ matrix.arch }}-${{ matrix.config }}-bin |
77 | 77 | path: |
|
78 | 78 | _build/${{ matrix.arch }}/${{ matrix.config }}/*.exe
|
79 | 79 | _build/${{ matrix.arch }}/${{ matrix.config }}/*.dll
|
@@ -116,16 +116,16 @@ jobs:
|
116 | 116 |
|
117 | 117 | - name: Fetch cppwinrt executables
|
118 | 118 | if: matrix.arch != 'arm64'
|
119 |
| - uses: actions/download-artifact@v3 |
| 119 | + uses: actions/download-artifact@v4 |
120 | 120 | with:
|
121 |
| - name: msvc-build-${{ matrix.arch }}-${{ matrix.config }}-bin |
| 121 | + name: msvc-build-${{ matrix.compiler}}-${{ matrix.arch }}-${{ matrix.config }}-bin |
122 | 122 | path: _build/${{ matrix.arch }}/${{ matrix.config }}/
|
123 | 123 |
|
124 | 124 | - name: Fetch x86 cppwinrt executables (arm64 only)
|
125 | 125 | if: matrix.arch == 'arm64'
|
126 |
| - uses: actions/download-artifact@v3 |
| 126 | + uses: actions/download-artifact@v4 |
127 | 127 | with:
|
128 |
| - name: msvc-build-x86-Release-bin |
| 128 | + name: msvc-build-${{ matrix.compiler}}-x86-Release-bin |
129 | 129 | path: _build/x86/Release/
|
130 | 130 |
|
131 | 131 | - name: Download nuget
|
@@ -240,9 +240,9 @@ jobs:
|
240 | 240 |
|
241 | 241 | - name: Upload arm64 test executables
|
242 | 242 | if: matrix.arch == 'arm64'
|
243 |
| - uses: actions/upload-artifact@v3 |
| 243 | + uses: actions/upload-artifact@v4 |
244 | 244 | with:
|
245 |
| - name: msvc-tests-${{ matrix.arch }}-${{ matrix.config }}-bin |
| 245 | + name: msvc-tests-${{ matrix.test_exe }}-${{ matrix.compiler }}-${{ matrix.arch }}-${{ matrix.config }}-bin |
246 | 246 | path: |
|
247 | 247 | _build/${{ matrix.arch }}/${{ matrix.config }}/*.exe
|
248 | 248 | _build/${{ matrix.arch }}/${{ matrix.config }}/*.dll
|
@@ -279,7 +279,7 @@ jobs:
|
279 | 279 | cmake --build build/cross_x64/ --target install -j2
|
280 | 280 |
|
281 | 281 | - name: Upload cppwinrt.exe
|
282 |
| - uses: actions/upload-artifact@v3 |
| 282 | + uses: actions/upload-artifact@v4 |
283 | 283 | with:
|
284 | 284 | name: cross-build-${{ matrix.arch }}-bin
|
285 | 285 | path: install/bin/cppwinrt.exe
|
@@ -323,20 +323,22 @@ jobs:
|
323 | 323 | cmd /c "$env:VSDevCmd" "&" msbuild /m /clp:ForceConsoleColor "$env:msbuild_config_props" /p:Deployment=${{ matrix.Deployment }} natvis\cppwinrtvisualizer.sln
|
324 | 324 |
|
325 | 325 | build-msvc-nuget-test:
|
326 |
| - name: 'Build nuget test' |
| 326 | + name: 'Build nuget test (${{ matrix.arch }})' |
327 | 327 | needs: test-msvc-cppwinrt-build
|
328 | 328 | strategy:
|
329 | 329 | matrix:
|
| 330 | + compiler: |
| 331 | + - MSVC |
330 | 332 | arch: [x86, x64]
|
331 | 333 | config: [Release]
|
332 | 334 | runs-on: windows-latest
|
333 | 335 | steps:
|
334 | 336 | - uses: actions/checkout@v4
|
335 | 337 |
|
336 | 338 | - name: Fetch cppwinrt executables
|
337 |
| - uses: actions/download-artifact@v3 |
| 339 | + uses: actions/download-artifact@v4 |
338 | 340 | with:
|
339 |
| - name: msvc-build-${{ matrix.arch }}-${{ matrix.config }}-bin |
| 341 | + name: msvc-build-${{ matrix.compiler}}-${{ matrix.arch }}-${{ matrix.config }}-bin |
340 | 342 | path: _build/${{ matrix.arch }}/${{ matrix.config }}/
|
341 | 343 |
|
342 | 344 | - name: Download nuget
|
@@ -396,7 +398,7 @@ jobs:
|
396 | 398 | }
|
397 | 399 |
|
398 | 400 | - name: Upload nuget package artifact
|
399 |
| - uses: actions/upload-artifact@v3 |
| 401 | + uses: actions/upload-artifact@v4 |
400 | 402 | with:
|
401 | 403 | name: package
|
402 | 404 | path: "*.nupkg"
|
0 commit comments