From 2499eae233706e0e8c5d0a43a745547c42704a26 Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Thu, 14 Feb 2019 15:48:10 -0800 Subject: [PATCH] Final fixes for grpc-tools build for real this time --- packages/grpc-tools/build_binaries.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/grpc-tools/build_binaries.ps1 b/packages/grpc-tools/build_binaries.ps1 index 1a99b99a6..bdb96a7b3 100644 --- a/packages/grpc-tools/build_binaries.ps1 +++ b/packages/grpc-tools/build_binaries.ps1 @@ -19,7 +19,7 @@ $ProtobufBase = $Base + "/deps/protobuf" MkDir-p ($Base + "/build/bin") $PackageFile = $Base + "/package.json" -$ToolsVersion = (Get-Content $PackageFile) -join "`n" | ConvertFrom-Json | Get-Member -Name version +$ToolsVersion = ((Get-Content $PackageFile) -join "`n" | ConvertFrom-Json).version $OutDir = $Env:ARTIFACTS_OUT + "/grpc-tools/v" + $ToolsVersion Mkdir-p $OutDir @@ -46,7 +46,7 @@ foreach ($Arch in $ArchList) { Copy-Item ($Base + "/Debug/grpc_node_plugin.exe") -Destination ($Base + "/build/bin/grpc_node_plugin.exe") Compress-7Zip -Path ($Base + "/build") -Format Tar -ArchiveFileName ($Base + "/Archive.tar") - Compress-7Zip -Path ($Base + "/Archive.tar") -Format GZip -ArchiveFileName ($OutDir + "/windows-x64.tar.gz") + Compress-7Zip -Path ($Base + "/Archive.tar") -Format GZip -ArchiveFileName ($OutDir + "/windows-" + $Arch + ".tar.gz") Remove-Item ($Base + "/build/bin/protoc.exe") Remove-Item ($Base + "/build/bin/grpc_node_plugin.exe")