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

Remove some logging. Change checkout master command and fetch command

Browse Source
This commit is contained in:
Daniel Donenfeld 2019-02-15 16:12:47 -08:00
parent 5530359dbc
commit 64f17b570a
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,28 +44,18 @@ function appveyorFinished {
return $false return $false
} }
Write-Host "[Appveyor] At Last Job: "
Write-Host $buildData
Write-Host $buildData.build
Write-Host $buildData.build.jobs
[datetime]$stop = ([datetime]::Now).AddMinutes($env:TIMEOUT_MINS) [datetime]$stop = ([datetime]::Now).AddMinutes($env:TIMEOUT_MINS)
do { do {
Write-Host "[Appveyor] Checking Build Jobs"
$allSuccess = $true $allSuccess = $true
(Get-AppVeyorBuild).build.jobs | Where-Object {$_.jobId -ne $env:APPVEYOR_JOB_ID} | Foreach-Object ` (Get-AppVeyorBuild).build.jobs | Where-Object {$_.jobId -ne $env:APPVEYOR_JOB_ID} | Foreach-Object `
{ {
$job = $_ $job = $_
Write-Host "[Appveyor] Checking Build Job $($job.jobId)"
Write-Host $job
Write-Host " "
switch ($job.status) { switch ($job.status) {
"failed" { throw "AppVeyor's Job ($($job.jobId)) failed." } "failed" { throw "AppVeyor's Job ($($job.jobId)) failed." }
"success" { continue } "success" { continue }
Default { Write-Host "Job status: $($job.status)"; Write-Host $job ;$allSuccess = $false } Default { $allSuccess = $false }
} }
} }
if ($allSuccess) { return $true } if ($allSuccess) { return $true }
@ -120,7 +110,6 @@ function collectAsm {
} }
git checkout $branchName 2>&1 git checkout $branchName 2>&1
git pull 2>&1
#Add branch to the branch list #Add branch to the branch list
# $branchName = "origin/"+$branchName # $branchName = "origin/"+$branchName
@ -134,9 +123,9 @@ function collectAsm {
#Merge all branches into master #Merge all branches into master
$branchString = $asmBranches -join ' ' $branchString = $asmBranches -join ' '
git checkout master 2>&1 git checkout origin/master 2>&1
git pull git pull
git fetch origin git fetch --all
git branch -a git branch -a
Write-Host "git merge --squash $($branchString)" Write-Host "git merge --squash $($branchString)"
git merge --squash $branchString git merge --squash $branchString