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 logging from branch deletion. Fix deploy-asm inclusion of API-Functions (hopefully)

Browse Source
This commit is contained in:
Daniel Donenfeld 2019-02-15 18:18:09 -08:00
parent e92e6e3f65
commit 8e6d1a4fe7
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
appveyor.yml
View File

@ -157,21 +157,11 @@ on_finish:
. .\asm\scripts\API-Functions.ps1 . .\asm\scripts\API-Functions.ps1
if(-not (Test-Path env:APPVEYOR_PULL_REQUEST_NUMBER)) { if(-not (Test-Path env:APPVEYOR_PULL_REQUEST_NUMBER)) {
# Delete all branches for asm if this is the last build # Delete all branches for asm if this is the last build
$build = Get-AppVeyorBuild $build = (Get-AppVeyorBuild).build
$jobs = $build.build.jobs $jobs = $build.jobs
$lastJob = ($jobs | Select-Object -Last 1) $lastJob = ($jobs | Select-Object -Last 1)
Write-Host "Build : $($build.build)" if (($lastJob.jobId -eq $env:APPVEYOR_JOB_ID)) {
Write-Host "Jobs:"
$jobs | Foreach-Object {
Write-Host " - $($_)"
}
Write-Host "Current job: $($env:APPVEYOR_JOB_ID)"
Write-Host "Last job: $($lastJob)"
if ($lastJob.jobId -eq $env:APPVEYOR_JOB_ID) {
$jobs | Foreach-Object { $jobs | Foreach-Object {
$branchName = "asm/$($env:APPVEYOR_REPO_COMMIT)/appveyor-$($_.jobId)" $branchName = "asm/$($env:APPVEYOR_REPO_COMMIT)/appveyor-$($_.jobId)"
git ls-remote --heads --exit-code https://github.com/dadonenf/GSL.git $branchName git ls-remote --heads --exit-code https://github.com/dadonenf/GSL.git $branchName

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

@ -1,5 +1,5 @@
# Include the API access functions # Include the API access functions
. .\API-Functions.ps1 . $PSScriptRoot\API-Functions.ps1
function collectAsm { function collectAsm {
# Create branch to merge asm into # Create branch to merge asm into