Build Windows x86 and x64 separately using a matrix

This commit is contained in:
Michael Lumish 2020-05-15 10:38:54 -07:00
parent 9b82abae06
commit 4c6847fc9f
2 changed files with 25 additions and 22 deletions

View File

@ -40,6 +40,11 @@ jobs:
windows_build:
name: Windows grpc-tools Build
runs-on: windows-latest
strategy:
matrix:
arch: [ia32, x64]
env:
ARCH: ${{matrix.arch}}
steps:
- uses: actions/checkout@v2
with:
@ -49,7 +54,7 @@ jobs:
shell: cmd
- uses: actions/upload-artifact@v1
with:
name: grpc-tools_windows
name: grpc-tools_windows_${{matrix.arch}}
path: artifacts/
combine_artifacts:
name: Combine grpc-tools artifacts

View File

@ -49,9 +49,8 @@ cd $Base
Set-PSDebug -trace 2
$ArchList = "ia32","x64"
$Arch = $Env:ARCH
foreach ($Arch in $ArchList) {
if ($Arch -eq "x64") {
$ArchName = "x64"
} else {
@ -74,4 +73,3 @@ foreach ($Arch in $ArchList) {
Compress-7Zip -Path ($Base + "/Archive.tar") -Format GZip -ArchiveFileName ($OutDir + "/win32-" + $Arch + ".tar.gz")
& git clean -xdf .
}