From 7e72576ace3eb318f2728ac0141fe6b5a772a50a Mon Sep 17 00:00:00 2001 From: Daniel Donenfeld Date: Fri, 15 Feb 2019 18:49:20 -0800 Subject: [PATCH] Wrap checkout of master in cmd.exe call. ENable more builds to test the asm generation --- appveyor.yml | 2 +- asm/scripts/deploy-asm.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 45df7ef..de39526 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,7 +6,7 @@ skip_branch_with_pr: true platform: - # - x86 + - x86 - x64 configuration: diff --git a/asm/scripts/deploy-asm.ps1 b/asm/scripts/deploy-asm.ps1 index 2839dce..ccc19be 100644 --- a/asm/scripts/deploy-asm.ps1 +++ b/asm/scripts/deploy-asm.ps1 @@ -23,7 +23,7 @@ function collectAsm { } #Merge all branches into master - git checkout master 2>&1 + cmd.exe /c "git checkout master 2>&1" cmd.exe /c "git merge --squash $($asmFinalBranch) 2>&1" if(-not $?){ throw "Failed merge"