Skip to content

Commit e03bdc4

Browse files
authored
Use latest upload/download actions (#1410)
1 parent 17d095a commit e03bdc4

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

.github/workflows/ci.yml

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ jobs:
7171
cmd /c "$env:VSDevCmd" "&" msbuild /m /clp:ForceConsoleColor "$env:msbuild_config_props" cppwinrt.sln /t:cppwinrt
7272
7373
- name: Upload built executables
74-
uses: actions/upload-artifact@v3
74+
uses: actions/upload-artifact@v4
7575
with:
76-
name: msvc-build-${{ matrix.arch }}-${{ matrix.config }}-bin
76+
name: msvc-build-${{ matrix.compiler}}-${{ matrix.arch }}-${{ matrix.config }}-bin
7777
path: |
7878
_build/${{ matrix.arch }}/${{ matrix.config }}/*.exe
7979
_build/${{ matrix.arch }}/${{ matrix.config }}/*.dll
@@ -116,16 +116,16 @@ jobs:
116116

117117
- name: Fetch cppwinrt executables
118118
if: matrix.arch != 'arm64'
119-
uses: actions/download-artifact@v3
119+
uses: actions/download-artifact@v4
120120
with:
121-
name: msvc-build-${{ matrix.arch }}-${{ matrix.config }}-bin
121+
name: msvc-build-${{ matrix.compiler}}-${{ matrix.arch }}-${{ matrix.config }}-bin
122122
path: _build/${{ matrix.arch }}/${{ matrix.config }}/
123123

124124
- name: Fetch x86 cppwinrt executables (arm64 only)
125125
if: matrix.arch == 'arm64'
126-
uses: actions/download-artifact@v3
126+
uses: actions/download-artifact@v4
127127
with:
128-
name: msvc-build-x86-Release-bin
128+
name: msvc-build-${{ matrix.compiler}}-x86-Release-bin
129129
path: _build/x86/Release/
130130

131131
- name: Download nuget
@@ -240,9 +240,9 @@ jobs:
240240
241241
- name: Upload arm64 test executables
242242
if: matrix.arch == 'arm64'
243-
uses: actions/upload-artifact@v3
243+
uses: actions/upload-artifact@v4
244244
with:
245-
name: msvc-tests-${{ matrix.arch }}-${{ matrix.config }}-bin
245+
name: msvc-tests-${{ matrix.test_exe }}-${{ matrix.compiler }}-${{ matrix.arch }}-${{ matrix.config }}-bin
246246
path: |
247247
_build/${{ matrix.arch }}/${{ matrix.config }}/*.exe
248248
_build/${{ matrix.arch }}/${{ matrix.config }}/*.dll
@@ -279,7 +279,7 @@ jobs:
279279
cmake --build build/cross_x64/ --target install -j2
280280
281281
- name: Upload cppwinrt.exe
282-
uses: actions/upload-artifact@v3
282+
uses: actions/upload-artifact@v4
283283
with:
284284
name: cross-build-${{ matrix.arch }}-bin
285285
path: install/bin/cppwinrt.exe
@@ -323,20 +323,22 @@ jobs:
323323
cmd /c "$env:VSDevCmd" "&" msbuild /m /clp:ForceConsoleColor "$env:msbuild_config_props" /p:Deployment=${{ matrix.Deployment }} natvis\cppwinrtvisualizer.sln
324324
325325
build-msvc-nuget-test:
326-
name: 'Build nuget test'
326+
name: 'Build nuget test (${{ matrix.arch }})'
327327
needs: test-msvc-cppwinrt-build
328328
strategy:
329329
matrix:
330+
compiler:
331+
- MSVC
330332
arch: [x86, x64]
331333
config: [Release]
332334
runs-on: windows-latest
333335
steps:
334336
- uses: actions/checkout@v4
335337

336338
- name: Fetch cppwinrt executables
337-
uses: actions/download-artifact@v3
339+
uses: actions/download-artifact@v4
338340
with:
339-
name: msvc-build-${{ matrix.arch }}-${{ matrix.config }}-bin
341+
name: msvc-build-${{ matrix.compiler}}-${{ matrix.arch }}-${{ matrix.config }}-bin
340342
path: _build/${{ matrix.arch }}/${{ matrix.config }}/
341343

342344
- name: Download nuget
@@ -396,7 +398,7 @@ jobs:
396398
}
397399
398400
- name: Upload nuget package artifact
399-
uses: actions/upload-artifact@v3
401+
uses: actions/upload-artifact@v4
400402
with:
401403
name: package
402404
path: "*.nupkg"

0 commit comments

Comments
 (0)