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

Fix issue with merging asm branches

Browse Source
This commit is contained in:
Daniel Donenfeld 2019-02-14 15:35:22 -08:00
parent 7f5624662e
commit 4b52cd13e1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,7 +110,7 @@ function collectAsm {
#collect all branches to merge #collect all branches to merge
$asmBranches = @() $asmBranches = @()
(Get-AppVeyorBuild).build.jobs | Foreach-Object { $asmBranches += "asm/$($env:APPVEYOR_REPO_COMMIT)/appveyor-$($_.jobId)"} (Get-AppVeyorBuild).build.jobs | Foreach-Object { $asmBranches += "origin/asm/$($env:APPVEYOR_REPO_COMMIT)/appveyor-$($_.jobId)"}
#TODO: collect asm from travis #TODO: collect asm from travis
# $travisBuild = Get-TravisBuild # $travisBuild = Get-TravisBuild
# $travisJobs = @() # $travisJobs = @()
@ -119,6 +119,7 @@ function collectAsm {
#Merge all branches into master #Merge all branches into master
$branchString = $asmBranches -join ' ' $branchString = $asmBranches -join ' '
git checkout master git checkout master
git pull
git merge --squash $branchString git merge --squash $branchString
git diff-index --cached --quiet --exit-code HEAD git diff-index --cached --quiet --exit-code HEAD
if(-not $?) { if(-not $?) {