From f5201436fc5b2bc8ac32e662fca3b0c86c8b4f05 Mon Sep 17 00:00:00 2001 From: Chidozie Ononiwu Date: Wed, 30 Oct 2024 14:04:32 -0700 Subject: [PATCH 1/2] Update Logging --- eng/common/scripts/logging.ps1 | 117 ++++++++++++++++++++++++--------- 1 file changed, 85 insertions(+), 32 deletions(-) diff --git a/eng/common/scripts/logging.ps1 b/eng/common/scripts/logging.ps1 index 84adec47fea97..6a0fff3b8d1af 100644 --- a/eng/common/scripts/logging.ps1 +++ b/eng/common/scripts/logging.ps1 @@ -1,40 +1,93 @@ -function Test-SupportsDevOpsLogging() -{ - return ($null -ne $env:SYSTEM_TEAMPROJECTID) +function Test-SupportsDevOpsLogging() { + return ($null -ne $env:SYSTEM_TEAMPROJECTID) } -function LogWarning -{ - if (Test-SupportsDevOpsLogging) - { - Write-Host "##vso[task.LogIssue type=warning;]$args" - } - else - { - Write-Warning "$args" - } +function Test-SupportsGitHubLogging() { + return ($null -ne $env:GITHUB_ACTIONS) } -function LogError -{ - if (Test-SupportsDevOpsLogging) - { - Write-Host "##vso[task.LogIssue type=error;]$args" - } - else - { - Write-Error "$args" - } +function LogInfo { + Write-Host "$args" +} + +function LogWarning { + if (Test-SupportsDevOpsLogging) { + Write-Host ("##vso[task.LogIssue type=warning;]$args" -replace "`n", "%0D%0A") + } + elseif (Test-SupportsGitHubLogging) { + Write-Warning ("::warning::$args" -replace "`n", "%0D%0A") + } + else { + Write-Warning "$args" + } } -function LogDebug +function LogSuccess { + $esc = [char]27 + $green = "${esc}[32m" + $reset = "${esc}[0m" + + Write-Host "${green}$args${reset}" +} + +function LogErrorForFile($file, $errorString) { - if (Test-SupportsDevOpsLogging) - { - Write-Host "[debug]$args" - } - else - { - Write-Debug "$args" - } + if (Test-SupportsDevOpsLogging) { + Write-Host ("##vso[task.logissue type=error;sourcepath=$file;linenumber=1;columnnumber=1;]$errorString" -replace "`n", "%0D%0A") + } + elseif (Test-SupportsGitHubLogging) { + Write-Error ("::error file=$file,line=1,col=1::$errorString" -replace "`n", "%0D%0A") + } + else { + Write-Error "[Error in file $file]$errorString" + } } + +function LogError { + if (Test-SupportsDevOpsLogging) { + Write-Host ("##vso[task.LogIssue type=error;]$args" -replace "`n", "%0D%0A") + } + elseif (Test-SupportsGitHubLogging) { + Write-Error ("::error::$args" -replace "`n", "%0D%0A") + } + else { + Write-Error "$args" + } +} + +function LogDebug { + if (Test-SupportsDevOpsLogging) { + Write-Host "[debug]$args" + } + elseif (Test-SupportsGitHubLogging) { + Write-Debug "::debug::$args" + } + else { + Write-Debug "$args" + } +} + +function LogGroupStart() { + if (Test-SupportsDevOpsLogging) { + Write-Host "##[group]$args" + } + elseif (Test-SupportsGitHubLogging) { + Write-Host "::group::$args" + } +} + +function LogGroupEnd() { + if (Test-SupportsDevOpsLogging) { + Write-Host "##[endgroup]" + } + elseif (Test-SupportsGitHubLogging) { + Write-Host "::endgroup::" + } +} + +function LogJobFailure() { + if (Test-SupportsDevOpsLogging) { + Write-Host "##vso[task.complete result=Failed;]" + } + # No equivalent for GitHub Actions. Failure is only determined by nonzero exit code. +} \ No newline at end of file From 422be306f66052261d6e9d5809a7214002fe918b Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Wed, 30 Oct 2024 14:25:04 -0700 Subject: [PATCH 2/2] Update eng/common/scripts/logging.ps1 --- eng/common/scripts/logging.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/scripts/logging.ps1 b/eng/common/scripts/logging.ps1 index 6a0fff3b8d1af..91640cd7eb5d5 100644 --- a/eng/common/scripts/logging.ps1 +++ b/eng/common/scripts/logging.ps1 @@ -90,4 +90,4 @@ function LogJobFailure() { Write-Host "##vso[task.complete result=Failed;]" } # No equivalent for GitHub Actions. Failure is only determined by nonzero exit code. -} \ No newline at end of file +}