diff options
| author | Lamont Granquist <454857+lamont-granquist@users.noreply.github.com> | 2022-03-24 10:50:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-24 10:50:38 -0700 |
| commit | 12a58e2df107e6154d991e57aeee99c8bd5f08a4 (patch) | |
| tree | af5c3e3ac358a8d679b1deb428ac2fdcc2857a20 /.expeditor | |
| parent | 79b5d08e7b8864c61c64e400527576b0a66f1f3b (diff) | |
| parent | 8ec51c55b4a76dd38667833316c02dc4fb523fbb (diff) | |
| download | chef-12a58e2df107e6154d991e57aeee99c8bd5f08a4.tar.gz | |
Merge pull request #12704 from chef/jsnapp/IPACK-136
Diffstat (limited to '.expeditor')
| -rw-r--r-- | .expeditor/scripts/bk_win_functional.ps1 | 6 | ||||
| -rw-r--r-- | .expeditor/scripts/bk_win_integration.ps1 | 3 | ||||
| -rw-r--r-- | .expeditor/verify.pipeline.yml | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/.expeditor/scripts/bk_win_functional.ps1 b/.expeditor/scripts/bk_win_functional.ps1 index 05f8e57248..8b4a445b44 100644 --- a/.expeditor/scripts/bk_win_functional.ps1 +++ b/.expeditor/scripts/bk_win_functional.ps1 @@ -9,12 +9,8 @@ $ErrorActionPreference = 'Stop' Write-Output "--- Enable Ruby 2.7" -Write-Output "Add Uru to Environment PATH" -$env:PATH = "C:\Program Files (x86)\Uru;" + $env:PATH -[Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine) - Write-Output "Register Installed Ruby Version 2.7 With Uru" -Start-Process "C:\Program Files (x86)\Uru\uru_rt.exe" -ArgumentList 'admin add C:\ruby27\bin' -Wait +Start-Process "uru_rt.exe" -ArgumentList 'admin add C:\ruby27\bin' -Wait uru 271 if (-not $?) { throw "Can't Activate Ruby. Did Uru Registration Succeed?" } ruby -v diff --git a/.expeditor/scripts/bk_win_integration.ps1 b/.expeditor/scripts/bk_win_integration.ps1 index 6b0debc790..7a2d99ecc8 100644 --- a/.expeditor/scripts/bk_win_integration.ps1 +++ b/.expeditor/scripts/bk_win_integration.ps1 @@ -2,8 +2,7 @@ $CurrentDirectory = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent $PrepScript = Join-Path $CurrentDirectory "bk_win_prep.ps1" Invoke-Expression $PrepScript -# Set-Item -Path Env:Path -Value ($Env:Path + ";C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin") -$Env:Path="C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;C:\ruby27\bin;C:\ci-studio-common\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\ProgramData\chocolatey\bin;C:\Program Files\Git\cmd;C:\Users\ContainerAdministrator\AppData\Local\Microsoft\WindowsApps;C:\Go\bin;C:\Users\ContainerAdministrator\go\bin" +Set-Item -Path Env:Path -Value ("C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;" + $Env:Path) winrm quickconfig -q diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 99c347db1d..14b168661f 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -264,7 +264,7 @@ steps: docker: image: rubydistros/almalinux-8:3.1 -- label: "Functional Windows :ruby: 3.0" +- label: "Functional Windows :ruby: 2.7" commands: - .expeditor/scripts/bk_win_functional.ps1 expeditor: |