Skip to content

Commit

Permalink
Merge pull request #5995 from habitat-sh/bk_ie
Browse files Browse the repository at this point in the history
fix invoke-webrequest on builfkite
  • Loading branch information
mwrock authored Dec 18, 2018
2 parents 4c74567 + 0e83e16 commit 85042e2
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .buildkite/scripts/bintray_upload.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Write-Host "--- Using hab executable at $baseHabExe"
# install buildkite agent because we are in a container :(
Write-Host "--- Installing buildkite agent in container"
$Env:buildkiteAgentToken = $Env:BUILDKITE_AGENT_ACCESS_TOKEN
Invoke-Expression (Invoke-WebRequest https://raw.githubusercontent.com/buildkite/agent/master/install.ps1).Content
Invoke-Expression (Invoke-WebRequest https://raw.githubusercontent.com/buildkite/agent/master/install.ps1 -UseBasicParsing).Content

$HabArtifact = & buildkite-agent meta-data get hab-artifact-windows --job $Env:BUILDKITE_JOB_ID

Expand Down
2 changes: 1 addition & 1 deletion .buildkite/scripts/build_component.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ $Env:HAB_BLDR_CHANNEL="$SourceChannel"
# install buildkite agent because we are in a container :(
Write-Host "--- Installing buildkite agent in container"
$Env:buildkiteAgentToken = $Env:BUILDKITE_AGENT_ACCESS_TOKEN
Invoke-Expression (Invoke-WebRequest https://raw.githubusercontent.com/buildkite/agent/master/install.ps1).Content
Invoke-Expression (Invoke-WebRequest https://raw.githubusercontent.com/buildkite/agent/master/install.ps1 -UseBasicParsing).Content

Write-Host "--- Installing base habitat binary version: $BaseHabVersion"
$baseHabExe = [HabShared]::install_base_habitat_binary($BaseHabVersion, $SourceChannel)
Expand Down
5 changes: 4 additions & 1 deletion support/ci/appveyor.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ function Get-RepoRoot {
(Resolve-Path "$PSScriptRoot\..\..\").Path
}
function Test-ReleaseBuild {
$env:APPVEYOR_REPO_TAG_NAME -eq (Get-Content "$(Get-RepoRoot)/VERSION") -and (!$env:APPVEYOR_REPO_TAG_NAME.EndsWith("dev"))
# $env:APPVEYOR_REPO_TAG_NAME -eq (Get-Content "$(Get-RepoRoot)/VERSION") -and (!$env:APPVEYOR_REPO_TAG_NAME.EndsWith("dev"))

# We are disabling release builds for now
$false
}

function Test-ComponentChanged ($path) {
Expand Down

0 comments on commit 85042e2

Please sign in to comment.