From ff133a544dded6fe8995c3cc15007e6580d2caef Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 3 Apr 2024 07:53:11 -0600 Subject: [PATCH] Windows: clean up temporary perl install Followup to #21991. Strawberry Perl is now installed by default in CI VMs[1], so we no longer need the temporary install-perl code. [1] https://github.com/containers/automation_images/pull/337 Signed-off-by: Ed Santiago --- contrib/cirrus/win-lib.ps1 | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/contrib/cirrus/win-lib.ps1 b/contrib/cirrus/win-lib.ps1 index 681adf0b6f..9b61da1378 100644 --- a/contrib/cirrus/win-lib.ps1 +++ b/contrib/cirrus/win-lib.ps1 @@ -40,22 +40,11 @@ if ($Env:CI -eq "true") { Remove-Item Env:\CIRRUS_PR_BODY -ErrorAction:Ignore } -function Install-Perl-If-Required { - if (-not (Get-Command perl -ErrorAction SilentlyContinue)) { - Write-Host "`nInstalling Perl as it is required to use logformatter" - choco install --no-progress --confirm --acceptlicense --nocolor StrawberryPerl - Write-Host "`nAdd perl to the PATH" - Set-Item "Env:PATH" "$Env:PATH;C:\Strawberry\perl\bin" - } -} - function Invoke-Logformatter { param ( [Collections.ArrayList] $unformattedLog ) - Install-Perl-If-Required - Write-Host "Invoking Logformatter" $logFormatterInput = @('/define.gitCommit=' + $(git rev-parse HEAD)) + $unformattedLog $logformatterPath = "$PSScriptRoot\logformatter"