From 291e974e46f3ae21d88b3b49d1d438ea4457f96d Mon Sep 17 00:00:00 2001 From: Tyler James Leonhardt Date: Thu, 27 Aug 2020 14:21:50 -0700 Subject: [PATCH] Update ci-general.yml --- .vsts-ci/templates/ci-general.yml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/.vsts-ci/templates/ci-general.yml b/.vsts-ci/templates/ci-general.yml index 848224778..34b81b7c1 100644 --- a/.vsts-ci/templates/ci-general.yml +++ b/.vsts-ci/templates/ci-general.yml @@ -2,21 +2,19 @@ parameters: pwsh: true steps: - # TODO: Bring this back when we understand why it was causing E2E tests to hang. - # Related issue: https://github.com/PowerShell/PowerShellEditorServices/issues/1335 - # - powershell: | - # Write-Host "Installing PowerShell Daily..." + - powershell: | + Write-Host "Installing PowerShell Daily..." - # # Use `AGENT_TEMPDIRECTORY` to make sure the downloaded PowerShell is cleaned up. - # $powerShellPath = Join-Path -Path $env:AGENT_TEMPDIRECTORY -ChildPath 'powershell' - # Invoke-WebRequest -Uri https://aka.ms/install-powershell.ps1 -OutFile ./install-powershell.ps1 + # Use `AGENT_TEMPDIRECTORY` to make sure the downloaded PowerShell is cleaned up. + $powerShellPath = Join-Path -Path $env:AGENT_TEMPDIRECTORY -ChildPath 'powershell' + Invoke-WebRequest -Uri https://aka.ms/install-powershell.ps1 -OutFile ./install-powershell.ps1 - # ./install-powershell.ps1 -Destination $powerShellPath -Daily + ./install-powershell.ps1 -Destination $powerShellPath -Daily - # # Using `prependpath` to update the PATH just for this build. - # Write-Host "##vso[task.prependpath]$powerShellPath" - # displayName: Install PowerShell Daily - # continueOnError: true + # Using `prependpath` to update the PATH just for this build. + Write-Host "##vso[task.prependpath]$powerShellPath" + displayName: Install PowerShell Daily + continueOnError: true - pwsh: '$PSVersionTable' displayName: Display PowerShell version information