Skip to content

Unique matrix artifacts #1410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kennykerr merged 2 commits into from
Apr 5, 2024
Merged

Unique matrix artifacts #1410

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e853319
Use unique artifacts
jsoref Apr 5, 2024
f643584
Upgrade to actions/*-artifact@v4
jsoref Apr 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 15 additions & 13 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ jobs:
cmd /c "$env:VSDevCmd" "&" msbuild /m /clp:ForceConsoleColor "$env:msbuild_config_props" cppwinrt.sln /t:cppwinrt

- name: Upload built executables
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
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 }}/*.exe
_build/${{ matrix.arch }}/${{ matrix.config }}/*.dll
Expand Down Expand Up @@ -116,16 +116,16 @@ jobs:

- name: Fetch cppwinrt executables
if: matrix.arch != 'arm64'
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
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 }}/

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

- name: Download nuget
Expand Down Expand Up @@ -240,9 +240,9 @@ jobs:

- name: Upload arm64 test executables
if: matrix.arch == 'arm64'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: msvc-tests-${{ matrix.arch }}-${{ matrix.config }}-bin
name: msvc-tests-${{ matrix.test_exe }}-${{ matrix.compiler }}-${{ matrix.arch }}-${{ matrix.config }}-bin
path: |
_build/${{ matrix.arch }}/${{ matrix.config }}/*.exe
_build/${{ matrix.arch }}/${{ matrix.config }}/*.dll
Expand Down Expand Up @@ -279,7 +279,7 @@ jobs:
cmake --build build/cross_x64/ --target install -j2

- name: Upload cppwinrt.exe
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: cross-build-${{ matrix.arch }}-bin
path: install/bin/cppwinrt.exe
Expand Down Expand Up @@ -323,20 +323,22 @@ jobs:
cmd /c "$env:VSDevCmd" "&" msbuild /m /clp:ForceConsoleColor "$env:msbuild_config_props" /p:Deployment=${{ matrix.Deployment }} natvis\cppwinrtvisualizer.sln

build-msvc-nuget-test:
name: 'Build nuget test'
name: 'Build nuget test (${{ matrix.arch }})'
needs: test-msvc-cppwinrt-build
strategy:
matrix:
compiler:
- MSVC
arch: [x86, x64]
config: [Release]
runs-on: windows-latest
steps:
- uses: actions/checkout@v4

- name: Fetch cppwinrt executables
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
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 }}/

- name: Download nuget
Expand Down Expand Up @@ -396,7 +398,7 @@ jobs:
}

- name: Upload nuget package artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: package
path: "*.nupkg"