diff --git a/appveyor.yml b/appveyor.yml index cdff495..45df7ef 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -166,7 +166,7 @@ on_finish: $branchName = "asm/$($env:APPVEYOR_REPO_COMMIT)/appveyor-$($_.jobId)" git ls-remote --heads --exit-code https://github.com/dadonenf/GSL.git $branchName if($?){ - git push origin --delete asm/$($env:APPVEYOR_REPO_COMMIT)/appveyor-$($_.jobId) 2>&1 + cmd.exe /c "git push origin --delete asm/$($env:APPVEYOR_REPO_COMMIT)/appveyor-$($_.jobId) 2>&1" } } } diff --git a/asm/scripts/deploy-asm.ps1 b/asm/scripts/deploy-asm.ps1 index 2028b60..2839dce 100644 --- a/asm/scripts/deploy-asm.ps1 +++ b/asm/scripts/deploy-asm.ps1 @@ -6,7 +6,7 @@ function collectAsm { git fetch --all 2>&1 $asmFinalBranch = "asm/$($env:APPVEYOR_REPO_COMMIT)/final" - git checkout -b $asmFinalBranch $env:APPVEYOR_REPO_BRANCH + cmd.exe /c "git checkout -b $($asmFinalBranch) $($env:APPVEYOR_REPO_BRANCH) 2>&1" #merge all branches into final branch (Get-AppVeyorBuild).build.jobs | Foreach-Object { @@ -18,19 +18,20 @@ function collectAsm { throw "Missing branch for job $($_.jobId)" } - git merge $branchName 2>&1 + cmd.exe /c "git merge $($branchName) 2>&1" + } - + #Merge all branches into master git checkout master 2>&1 - cmd.exe /c "git merge --squash $($asmFinalBranch)" + cmd.exe /c "git merge --squash $($asmFinalBranch) 2>&1" if(-not $?){ throw "Failed merge" } git diff-index --cached --quiet --exit-code HEAD if(-not $?) { git commit -m "[skip ci] Update ASM for $($env:APPVEYOR_REPO_COMMIT)" - git push + cmd.exe /c "git push 2>&1" } }