mirror of
https://github.com/microsoft/GSL.git
synced 2024-11-03 17:56:43 -05:00
Wrap checkout of master in cmd.exe call. ENable more builds to test the asm generation
This commit is contained in:
parent
096d572749
commit
7e72576ace
@ -6,7 +6,7 @@ skip_branch_with_pr: true
|
||||
|
||||
|
||||
platform:
|
||||
# - x86
|
||||
- x86
|
||||
- x64
|
||||
|
||||
configuration:
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user