para/GSL
1
0
Fork 0
mirror of https://github.com/microsoft/GSL.git synced 2024-11-03 17:56:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
appveyor.yml
View File

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

2
asm/scripts/deploy-asm.ps1
View File

@ -23,7 +23,7 @@ function collectAsm {
} }
#Merge all branches into master #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" cmd.exe /c "git merge --squash $($asmFinalBranch) 2>&1"
if(-not $?){ if(-not $?){
throw "Failed merge" throw "Failed merge"