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

Add logging of branches. Throw on merge

Browse Source
This commit is contained in:
Daniel Donenfeld 2019-02-14 15:48:27 -08:00
parent 4b52cd13e1
commit 5afeb81bf9
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,7 +120,11 @@ function collectAsm {
$branchString = $asmBranches -join ' ' $branchString = $asmBranches -join ' '
git checkout master git checkout master
git pull git pull
git branch -a
git merge --squash $branchString git merge --squash $branchString
if(-not $?){
throw "Failed merge"
}
git diff-index --cached --quiet --exit-code HEAD git diff-index --cached --quiet --exit-code HEAD
if(-not $?) { if(-not $?) {
git commit -m "[skip ci] Update ASM for $($env:APPVEYOR_REPO_COMMIT)" git commit -m "[skip ci] Update ASM for $($env:APPVEYOR_REPO_COMMIT)"