From cf0d3268f0f99e00e8bb9b25f1d7d5df730551b1 Mon Sep 17 00:00:00 2001 From: Daniel Donenfeld Date: Fri, 15 Feb 2019 17:40:12 -0800 Subject: [PATCH] checkout master, not origin master. Add logging --- appveyor.yml | 2 ++ asm/scripts/deploy-asm.ps1 | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 7d424ab..9309b6a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -162,6 +162,8 @@ on_finish: $jobs = $buildData.build.jobs $lastJob = ($jobs | Select-Object -Last 1) + Write-Host "Build : $($buildData.build)" + Write-Host "Jobs:" $jobs | Foreach-Object { Write-Host " - $($_)" diff --git a/asm/scripts/deploy-asm.ps1 b/asm/scripts/deploy-asm.ps1 index 888767d..9f428a7 100644 --- a/asm/scripts/deploy-asm.ps1 +++ b/asm/scripts/deploy-asm.ps1 @@ -123,7 +123,7 @@ function collectAsm { #Merge all branches into master $branchString = $asmBranches -join ' ' - git checkout origin/master 2>&1 + git checkout master 2>&1 git pull git fetch --all git branch -a