diff options
| author | Kai Pastor <dg0yt@darc.de> | 2021-09-28 23:00:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-28 14:00:33 -0700 |
| commit | 827a54c404e67205262e6db032fb2c1a5e6fd097 (patch) | |
| tree | cc67be8ab443d85752dd5af37a9a874b6ca4e6b1 /scripts | |
| parent | 09980780d8870082977d399dc172d86ef6a45818 (diff) | |
| download | vcpkg-827a54c404e67205262e6db032fb2c1a5e6fd097.tar.gz vcpkg-827a54c404e67205262e6db032fb2c1a5e6fd097.zip | |
[ci] Don't emit warnings for absence of failure logs (#20316)
* No warning for absence of failure logs
* Update condition for osx and linux
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Diffstat (limited to 'scripts')
4 files changed, 6 insertions, 3 deletions
diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml index f68f971e5..0025750ee 100644 --- a/scripts/azure-pipelines/linux/azure-pipelines.yml +++ b/scripts/azure-pipelines/linux/azure-pipelines.yml @@ -56,7 +56,7 @@ jobs: inputs:
PathtoPublish: '$(Build.ArtifactStagingDirectory)/failure-logs'
ArtifactName: 'failure logs for x64-linux'
- condition: always()
+ condition: ne(variables['FAILURE_LOGS_EMPTY'], 'True')
- bash: |
python3 scripts/file_script.py /mnt/vcpkg-ci/installed/vcpkg/info/
displayName: 'Build a file list for all packages'
diff --git a/scripts/azure-pipelines/osx/azure-pipelines.yml b/scripts/azure-pipelines/osx/azure-pipelines.yml index 154247da4..aa5884f0b 100644 --- a/scripts/azure-pipelines/osx/azure-pipelines.yml +++ b/scripts/azure-pipelines/osx/azure-pipelines.yml @@ -50,7 +50,7 @@ jobs: inputs:
PathtoPublish: '$(Build.ArtifactStagingDirectory)/failure-logs'
ArtifactName: 'failure logs for x64-osx'
- condition: always()
+ condition: ne(variables['FAILURE_LOGS_EMPTY'], 'True')
- bash: |
python3 scripts/file_script.py /Users/vagrant/Data/installed/vcpkg/info/
displayName: 'Build a file list for all packages'
diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index 8212509d0..d55c6f629 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -137,6 +137,9 @@ else & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --failure-logs=$failureLogs @commonArgs
}
+$failureLogsEmpty = ((Test-Path $failureLogs) -and (Get-ChildItem $failureLogs).count -eq 0)
+Write-Host "##vso[task.setvariable variable=FAILURE_LOGS_EMPTY]$failureLogsEmpty"
+
if ($LASTEXITCODE -ne 0)
{
throw "vcpkg ci failed"
diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index d341a7a9d..60ba6fa1b 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -115,7 +115,7 @@ jobs: inputs:
PathtoPublish: '$(Build.ArtifactStagingDirectory)\failure-logs'
ArtifactName: 'failure logs for ${{ parameters.triplet }}'
- condition: always()
+ condition: ne(variables['FAILURE_LOGS_EMPTY'], 'True')
- task: PowerShell@2
displayName: 'Build a file list for all packages'
condition: always()
|