From 8177f3f1d1ce1947a452fc30d67f2370a3cce598 Mon Sep 17 00:00:00 2001
From: Peter Mounce <petermounce@improbable.io>
Date: Fri, 28 Jul 2017 14:48:50 +0200
Subject: Adjust chocolatey package for new artifact names

Closes #3466.

PiperOrigin-RevId: 163459450
---
 scripts/packages/chocolatey/build.ps1 | 6 ++++--
 scripts/packages/chocolatey/test.ps1  | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'scripts/packages')

diff --git a/scripts/packages/chocolatey/build.ps1 b/scripts/packages/chocolatey/build.ps1
index 87b4a3637f..de17d7c9b4 100644
--- a/scripts/packages/chocolatey/build.ps1
+++ b/scripts/packages/chocolatey/build.ps1
@@ -6,15 +6,17 @@ param(
   [string] $checksum = ""
 )
 
+$ErrorActionPreference = 'Stop'
+
 write-host "mode: $mode"
 if ($mode -eq "release") {
   $tvVersion = $version
-  $tvFilename = "bazel-msvc-$($tvVersion)-windows-msvc-x86_64.zip"
+  $tvFilename = "bazel-$($tvVersion)-windows-x86_64.zip"
   $tvUri = "https://github.com/bazelbuild/bazel/releases/download/$($tvVersion)/$($tvFilename)"
   $tvReleaseNotesUri = "https://github.com/bazelbuild/bazel/releases/tag/$tvVersion"
 } elseif ($mode -eq "rc") {
   $tvVersion = "$($version)-rc$($rc)"
-  $tvFilename = "bazel-msvc-$($version)rc$($rc)-windows-msvc-x86_64.zip"
+  $tvFilename = "bazel-$($version)rc$($rc)-windows-x86_64.zip"
   $tvUri = "https://release.bazel.build/$($version)/rc$($rc)/$($tvFilename)"
   $tvReleaseNotesUri = "https://release.bazel.build/$($version)/rc$($rc)/index.html"
 } elseif ($mode -eq "local") {
diff --git a/scripts/packages/chocolatey/test.ps1 b/scripts/packages/chocolatey/test.ps1
index a2349351cd..08de5d2d72 100644
--- a/scripts/packages/chocolatey/test.ps1
+++ b/scripts/packages/chocolatey/test.ps1
@@ -4,6 +4,8 @@ param(
   [string] $version = "0.4.5.20170330"
 )
 
+$ErrorActionPreference = 'Stop'
+
 choco uninstall bazel --force -y
 if ($prerelease) {
   choco install ".\bazel.$($version).nupkg" --verbose --debug --prerelease --force -y -s $sources
-- 
cgit v1.2.3