Use latest upload/download actions (#1410)

This commit is contained in:
Josh Soref 2024-04-05 14:16:37 -04:00 коммит произвёл GitHub
Родитель 17d095ac93
Коммит e03bdc4e39
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
1 изменённых файлов: 15 добавлений и 13 удалений

28
.github/workflows/ci.yml поставляемый
Просмотреть файл

@ -71,9 +71,9 @@ jobs:
cmd /c "$env:VSDevCmd" "&" msbuild /m /clp:ForceConsoleColor "$env:msbuild_config_props" cppwinrt.sln /t:cppwinrt cmd /c "$env:VSDevCmd" "&" msbuild /m /clp:ForceConsoleColor "$env:msbuild_config_props" cppwinrt.sln /t:cppwinrt
- name: Upload built executables - name: Upload built executables
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: msvc-build-${{ matrix.arch }}-${{ matrix.config }}-bin name: msvc-build-${{ matrix.compiler}}-${{ matrix.arch }}-${{ matrix.config }}-bin
path: | path: |
_build/${{ matrix.arch }}/${{ matrix.config }}/*.exe _build/${{ matrix.arch }}/${{ matrix.config }}/*.exe
_build/${{ matrix.arch }}/${{ matrix.config }}/*.dll _build/${{ matrix.arch }}/${{ matrix.config }}/*.dll
@ -116,16 +116,16 @@ jobs:
- name: Fetch cppwinrt executables - name: Fetch cppwinrt executables
if: matrix.arch != 'arm64' if: matrix.arch != 'arm64'
uses: actions/download-artifact@v3 uses: actions/download-artifact@v4
with: with:
name: msvc-build-${{ matrix.arch }}-${{ matrix.config }}-bin name: msvc-build-${{ matrix.compiler}}-${{ matrix.arch }}-${{ matrix.config }}-bin
path: _build/${{ matrix.arch }}/${{ matrix.config }}/ path: _build/${{ matrix.arch }}/${{ matrix.config }}/
- name: Fetch x86 cppwinrt executables (arm64 only) - name: Fetch x86 cppwinrt executables (arm64 only)
if: matrix.arch == 'arm64' if: matrix.arch == 'arm64'
uses: actions/download-artifact@v3 uses: actions/download-artifact@v4
with: with:
name: msvc-build-x86-Release-bin name: msvc-build-${{ matrix.compiler}}-x86-Release-bin
path: _build/x86/Release/ path: _build/x86/Release/
- name: Download nuget - name: Download nuget
@ -240,9 +240,9 @@ jobs:
- name: Upload arm64 test executables - name: Upload arm64 test executables
if: matrix.arch == 'arm64' if: matrix.arch == 'arm64'
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: msvc-tests-${{ matrix.arch }}-${{ matrix.config }}-bin name: msvc-tests-${{ matrix.test_exe }}-${{ matrix.compiler }}-${{ matrix.arch }}-${{ matrix.config }}-bin
path: | path: |
_build/${{ matrix.arch }}/${{ matrix.config }}/*.exe _build/${{ matrix.arch }}/${{ matrix.config }}/*.exe
_build/${{ matrix.arch }}/${{ matrix.config }}/*.dll _build/${{ matrix.arch }}/${{ matrix.config }}/*.dll
@ -279,7 +279,7 @@ jobs:
cmake --build build/cross_x64/ --target install -j2 cmake --build build/cross_x64/ --target install -j2
- name: Upload cppwinrt.exe - name: Upload cppwinrt.exe
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: cross-build-${{ matrix.arch }}-bin name: cross-build-${{ matrix.arch }}-bin
path: install/bin/cppwinrt.exe path: install/bin/cppwinrt.exe
@ -323,10 +323,12 @@ jobs:
cmd /c "$env:VSDevCmd" "&" msbuild /m /clp:ForceConsoleColor "$env:msbuild_config_props" /p:Deployment=${{ matrix.Deployment }} natvis\cppwinrtvisualizer.sln cmd /c "$env:VSDevCmd" "&" msbuild /m /clp:ForceConsoleColor "$env:msbuild_config_props" /p:Deployment=${{ matrix.Deployment }} natvis\cppwinrtvisualizer.sln
build-msvc-nuget-test: build-msvc-nuget-test:
name: 'Build nuget test' name: 'Build nuget test (${{ matrix.arch }})'
needs: test-msvc-cppwinrt-build needs: test-msvc-cppwinrt-build
strategy: strategy:
matrix: matrix:
compiler:
- MSVC
arch: [x86, x64] arch: [x86, x64]
config: [Release] config: [Release]
runs-on: windows-latest runs-on: windows-latest
@ -334,9 +336,9 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Fetch cppwinrt executables - name: Fetch cppwinrt executables
uses: actions/download-artifact@v3 uses: actions/download-artifact@v4
with: with:
name: msvc-build-${{ matrix.arch }}-${{ matrix.config }}-bin name: msvc-build-${{ matrix.compiler}}-${{ matrix.arch }}-${{ matrix.config }}-bin
path: _build/${{ matrix.arch }}/${{ matrix.config }}/ path: _build/${{ matrix.arch }}/${{ matrix.config }}/
- name: Download nuget - name: Download nuget
@ -396,7 +398,7 @@ jobs:
} }
- name: Upload nuget package artifact - name: Upload nuget package artifact
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: package name: package
path: "*.nupkg" path: "*.nupkg"