Skip to content

Commit

Permalink
Merge pull request #2842 from habitat-sh/fix_deploy
Browse files Browse the repository at this point in the history
Approved by: @nobody from Nowhere
Merged by: The Sentinels
  • Loading branch information
thesentinels authored Jul 28, 2017
2 parents 3e95fd7 + 1d2a81d commit 25cb200
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions support/ci/appveyor.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
}
}
}
Expand Down

0 comments on commit 25cb200

Please sign in to comment.