From 1d2a81dc958c26936e9dc88a664376473491f5a4 Mon Sep 17 00:00:00 2001 From: Matt Wrock Date: Thu, 27 Jul 2017 17:16:34 -0700 Subject: [PATCH] use 0.26.1 to build windows harts and then use current studio to test it works Signed-off-by: Matt Wrock --- appveyor.yml | 1 + support/ci/appveyor.ps1 | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 7aaf0c653e..fd1af1f91b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -37,6 +37,7 @@ environment: hab_components: "core;http-client;builder-protocol;builder-depot-client;common;win-users;sup;hab-butterfly" - hab_build_action: "package" + hab_exe_version: "0.26.1-20170718004619" hab_components: "hab;plan-build-ps1;studio;sup;hab-butterfly" build_script: diff --git a/support/ci/appveyor.ps1 b/support/ci/appveyor.ps1 index 90d54e72ff..0d92cfd64e 100644 --- a/support/ci/appveyor.ps1 +++ b/support/ci/appveyor.ps1 @@ -77,7 +77,7 @@ if (($env:APPVEYOR_REPO_TAG_NAME -eq "$(Get-Content VERSION)") -or (Test-SourceC elseif ($BuildAction -like 'package') { Write-Host "Download and install latest release of hab.exe" $bootstrapDir = "c:\habitat" - $url = "https://api.bintray.com/content/habitat/stable/windows/x86_64/hab-%24latest-x86_64-windows.zip?bt_package=hab-x86_64-windows" + $url = "https://api.bintray.com/content/habitat/stable/windows/x86_64/hab-$($env:hab_exe_version)-x86_64-windows.zip?bt_package=hab-x86_64-windows" mkdir $bootstrapDir -Force # download a hab binary to build hab from source in a studio Invoke-WebRequest -UseBasicParsing -Uri $url -OutFile hab.zip @@ -135,7 +135,7 @@ if (($env:APPVEYOR_REPO_TAG_NAME -eq "$(Get-Content VERSION)") -or (Test-SourceC } if ($component -eq "studio") { # Now that we have built the studio we can use current hab and studio bits - Copy-Item "/hab/pkgs/core/hab/*/*/bin/*" $bootstrapDir -Force + Copy-Item "/hab/pkgs/core/hab/*/*/bin/*" (Split-Path $habExe -Parent) -Force } } }