From 8e6d1a4fe74a2b0170a4656777ae24149997d132 Mon Sep 17 00:00:00 2001 From: Daniel Donenfeld Date: Fri, 15 Feb 2019 18:18:09 -0800 Subject: [PATCH] Remove logging from branch deletion. Fix deploy-asm inclusion of API-Functions (hopefully) --- appveyor.yml | 16 +++------------- asm/scripts/deploy-asm.ps1 | 2 +- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 9addce7..cdff495 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -157,21 +157,11 @@ on_finish: . .\asm\scripts\API-Functions.ps1 if(-not (Test-Path env:APPVEYOR_PULL_REQUEST_NUMBER)) { # Delete all branches for asm if this is the last build - $build = Get-AppVeyorBuild - $jobs = $build.build.jobs + $build = (Get-AppVeyorBuild).build + $jobs = $build.jobs $lastJob = ($jobs | Select-Object -Last 1) - Write-Host "Build : $($build.build)" - - Write-Host "Jobs:" - $jobs | Foreach-Object { - Write-Host " - $($_)" - } - - Write-Host "Current job: $($env:APPVEYOR_JOB_ID)" - Write-Host "Last job: $($lastJob)" - - if ($lastJob.jobId -eq $env:APPVEYOR_JOB_ID) { + if (($lastJob.jobId -eq $env:APPVEYOR_JOB_ID)) { $jobs | Foreach-Object { $branchName = "asm/$($env:APPVEYOR_REPO_COMMIT)/appveyor-$($_.jobId)" git ls-remote --heads --exit-code https://github.com/dadonenf/GSL.git $branchName diff --git a/asm/scripts/deploy-asm.ps1 b/asm/scripts/deploy-asm.ps1 index e5c3253..8faa907 100644 --- a/asm/scripts/deploy-asm.ps1 +++ b/asm/scripts/deploy-asm.ps1 @@ -1,5 +1,5 @@ # Include the API access functions -. .\API-Functions.ps1 +. $PSScriptRoot\API-Functions.ps1 function collectAsm { # Create branch to merge asm into