2019-02-15 20:51:48 -05:00
|
|
|
# Include the API access functions
|
2019-02-15 21:18:09 -05:00
|
|
|
. $PSScriptRoot\API-Functions.ps1
|
2019-02-14 13:56:46 -05:00
|
|
|
|
|
|
|
function collectAsm {
|
|
|
|
# Create branch to merge asm into
|
2019-02-15 21:30:41 -05:00
|
|
|
git fetch --all 2>&1
|
2019-02-14 13:56:46 -05:00
|
|
|
|
2019-02-15 21:30:41 -05:00
|
|
|
$asmFinalBranch = "asm/$($env:APPVEYOR_REPO_COMMIT)/final"
|
2019-02-15 21:41:03 -05:00
|
|
|
cmd.exe /c "git checkout -b $($asmFinalBranch) $($env:APPVEYOR_REPO_BRANCH) 2>&1"
|
2019-02-15 21:30:41 -05:00
|
|
|
|
|
|
|
#merge all branches into final branch
|
2019-02-15 14:36:40 -05:00
|
|
|
(Get-AppVeyorBuild).build.jobs | Foreach-Object {
|
|
|
|
$branchName = "asm/$($env:APPVEYOR_REPO_COMMIT)/appveyor-$($_.jobId)"
|
|
|
|
|
|
|
|
#Check that all branches exist
|
|
|
|
git ls-remote --heads --exit-code https://github.com/dadonenf/GSL.git $branchName
|
|
|
|
if(-not $?){
|
|
|
|
throw "Missing branch for job $($_.jobId)"
|
|
|
|
}
|
|
|
|
|
2019-02-17 00:09:30 -05:00
|
|
|
# Use cherry-pick as the asm branches only have a single commit
|
2019-02-17 00:30:38 -05:00
|
|
|
cmd.exe /c "git cherry-pick origin/$($branchName) 2>&1"
|
2019-02-15 22:00:15 -05:00
|
|
|
if(-not $?){
|
|
|
|
throw "Failed merge of $($branchName)"
|
|
|
|
}
|
2019-02-15 14:36:40 -05:00
|
|
|
}
|
2019-02-15 21:41:03 -05:00
|
|
|
|
2019-02-14 13:56:46 -05:00
|
|
|
#Merge all branches into master
|
2019-02-15 21:49:20 -05:00
|
|
|
cmd.exe /c "git checkout master 2>&1"
|
2019-02-15 21:41:03 -05:00
|
|
|
cmd.exe /c "git merge --squash $($asmFinalBranch) 2>&1"
|
2019-02-14 18:48:27 -05:00
|
|
|
if(-not $?){
|
|
|
|
throw "Failed merge"
|
|
|
|
}
|
2019-02-14 13:56:46 -05:00
|
|
|
git diff-index --cached --quiet --exit-code HEAD
|
|
|
|
if(-not $?) {
|
|
|
|
git commit -m "[skip ci] Update ASM for $($env:APPVEYOR_REPO_COMMIT)"
|
2019-02-15 21:41:03 -05:00
|
|
|
cmd.exe /c "git push 2>&1"
|
2019-02-14 13:56:46 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-02-14 17:46:00 -05:00
|
|
|
Write-Host "Starting asm deployment"
|
|
|
|
|
2019-02-14 13:56:46 -05:00
|
|
|
# Wait for all jobs
|
|
|
|
if(appveyorFinished) {
|
2019-02-14 17:46:00 -05:00
|
|
|
|
|
|
|
Write-Host "Appveyor Finished, collecting ASM"
|
|
|
|
|
2019-02-14 13:56:46 -05:00
|
|
|
# Collect ASM (currently from Appveyor only)
|
|
|
|
collectAsm
|
|
|
|
}
|