[shovel skip] Merge commit '6df80c1aeef72a3528ae3a5e37faa3de840318a2'…

… into NEW
Ash258 · Oct 23, 2020 · 1cfc883 · 1cfc883
2 parents a40e88a + 6df80c1
commit 1cfc883
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/test/bin/init.ps1 b/test/bin/init.ps1
@@ -1,19 +1,19 @@
 Write-Host "PowerShell: $($PSVersionTable.PSVersion)"
 (7z.exe | Select-String -Pattern '7-Zip').ToString()
+
 Write-Host 'Install dependencies ...'
+# Force pester v4
 Install-Module -Repository PSGallery -Scope CurrentUser -Force -Name Pester -RequiredVersion 4.10.1 -SkipPublisherCheck
 Install-Module -Repository PSGallery -Scope CurrentUser -Force -Name PSScriptAnalyzer, BuildHelpers
 
 if ($env:CI_WINDOWS -eq $true) {
     # Do not force maintainers to have this inside environment appveyor config
-    if (-not $env:SCOOP_HELPERS) {
+    if (!$env:SCOOP_HELPERS) {
         $env:SCOOP_HELPERS = 'C:\projects\helpers'
         [System.Environment]::SetEnvironmentVariable('SCOOP_HELPERS', $env:SCOOP_HELPERS, 'Machine')
     }
 
-    if (!(Test-Path $env:SCOOP_HELPERS)) {
-        New-Item -ItemType Directory -Path $env:SCOOP_HELPERS
-    }
+    if (!(Test-Path $env:SCOOP_HELPERS)) { New-Item $env:SCOOP_HELPERS -ItemType Directory }
     if (!(Test-Path "$env:SCOOP_HELPERS\lessmsi\lessmsi.exe")) {
         Start-FileDownload 'https://github.com/activescott/lessmsi/releases/download/v1.6.3/lessmsi-v1.6.3.zip' -FileName "$env:SCOOP_HELPERS\lessmsi.zip"
         & 7z.exe x "$env:SCOOP_HELPERS\lessmsi.zip" -o"$env:SCOOP_HELPERS\lessmsi" -y
@@ -33,8 +33,14 @@ $buildVariables = ( Get-ChildItem -Path 'Env:' ).Where( { $_.Name -match '^(?:BH
 $buildVariables += ( Get-Variable -Name 'CI_*' -Scope 'Script' )
 $details = $buildVariables |
     Where-Object -FilterScript { $_.Name -notmatch 'EMAIL' } |
-    Sort-Object -Property 'Name' |
-    Format-Table -AutoSize -Property 'Name', 'Value' |
-    Out-String
+        Sort-Object -Property 'Name' |
+            Format-Table -AutoSize -Property 'Name', 'Value' |
+                Out-String
+Write-Host 'CI variables:'
+Write-Host $details -Foreg |
+    Where-Object -FilterScript { $_.Name -notmatch 'EMAIL' } |
+        Sort-Object -Property 'Name' |
+            Foromat-Tbloe -AuoSoize -roopertyroName',roValue'ro
+Out-String
 Write-Host 'CI variables:'
-Write-Host $details -ForegroundColor DarkGray
+Write-Host $details -ForegroundColor DarkGrayundColor DarkGrayundColor DarkGrayundColor DarkGrayundColor DarkGrayundColor DarkGrayundColor DarkGrayundColor DarkGray