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

Only cherry-pick if there are asm diffs

Browse Source
This commit is contained in:
Daniel Donenfeld 2019-02-26 16:47:35 -08:00
parent bcd7b60df7
commit 30092d9f6f
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,12 +18,16 @@ function collectAsm {
throw "Missing branch for job $($_.jobId)"
}
#Only merge in asm if there is any change between the current branch and the final asm branch
cmd.exe /c "git diff --quiet $($branchName)..$($asmFinalBranch)"
if(-not $?){
# Use cherry-pick as the asm branches only have a single commit
cmd.exe /c "git cherry-pick origin/$($branchName) --allow-empty 2>&1"
if(-not $?){
throw "Failed merge of $($branchName)"
}
}
}
#Merge all branches into master
cmd.exe /c "git checkout master 2>&1"