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

Merge all branches into APPVEYOR_REPO_BRANCH instead of master in case otehr development branches are used. Try checking out APPVEYOR_REPO_BRANCH before collecting asm

Browse Source
This commit is contained in:
Daniel Donenfeld 2019-02-26 18:17:10 -08:00
parent 560a596cf8
commit c1697529d2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,8 @@
. $PSScriptRoot\API-Functions.ps1 . $PSScriptRoot\API-Functions.ps1
function collectAsm { function collectAsm {
cmd.exe /c "git checkout $($env:APPVEYOR_REPO_BRANCH) 2>&1"
# Create branch to merge asm into # Create branch to merge asm into
git fetch --all 2>&1 git fetch --all 2>&1
@ -33,8 +35,8 @@ function collectAsm {
} }
} }
#Merge all branches into master #Merge all branches into $($env:APPVEYOR_REPO_BRANCH)
cmd.exe /c "git checkout master 2>&1" cmd.exe /c "git checkout $($env:APPVEYOR_REPO_BRANCH) 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"