Wrap checkout of master in cmd.exe call. ENable more builds to test the asm generation

This commit is contained in:
Daniel Donenfeld 2019-02-15 18:49:20 -08:00
parent 096d572749
commit 7e72576ace
2 changed files with 2 additions and 2 deletions

View File

@ -6,7 +6,7 @@ skip_branch_with_pr: true
platform:
# - x86
- x86
- x64
configuration:

View File

@ -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"