diff options
| author | John McCrae <john.mccrae@progress.com> | 2022-10-20 12:10:14 +0600 |
|---|---|---|
| committer | John McCrae <john.mccrae@progress.com> | 2022-10-20 16:34:54 +0600 |
| commit | 14f262ca35854259a1e9b8e9b92db65ed1188d1c (patch) | |
| tree | 3fb825e841d20fff72aeabe15fefdab48dd3ec25 | |
| parent | e67aa4a20741ce1bc4e7f544589bda6472eec8a1 (diff) | |
| download | chef-14f262ca35854259a1e9b8e9b92db65ed1188d1c.tar.gz | |
Corrected the installer to load Chef-17 instead of Chef-18. And more digging for Hab
Signed-off-by: John McCrae <john.mccrae@progress.com>
| -rw-r--r-- | .expeditor/scripts/ensure-minimum-viable-hab.ps1 | 17 | ||||
| -rw-r--r-- | .github/workflows/kitchen.yml | 2 |
2 files changed, 9 insertions, 10 deletions
diff --git a/.expeditor/scripts/ensure-minimum-viable-hab.ps1 b/.expeditor/scripts/ensure-minimum-viable-hab.ps1 index 8ec349e1b8..c652159380 100644 --- a/.expeditor/scripts/ensure-minimum-viable-hab.ps1 +++ b/.expeditor/scripts/ensure-minimum-viable-hab.ps1 @@ -2,12 +2,12 @@ try { [Version]$hab_version = (hab --version).split(" ")[1].split("/")[0] if ($hab_version -lt [Version]"0.85.0" ) { Write-Host "--- :habicat: Installing the version of Habitat required" - Write-Output "What version of Windows and PowerShell is this?`n" - write-output "`n" + Write-Host "What version of Windows and PowerShell is this?`n" + Write-Host "`n" $PSVersionTable [System.Environment]::OSVersion - Write-Output "What version of Hab is this? $((hab --version).split(" ")[1].split("/")[0])" - write-output "`n" + Write-Host "What version of Hab is this? $((hab --version).split(" ")[1].split("/")[0])" + Write-Host "`n" Get-Command Hab Set-ExecutionPolicy Bypass -Scope Process -Force Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/habitat-sh/habitat/main/components/hab/install.ps1')) @@ -18,14 +18,13 @@ try { } } catch { - Write-Output "What version of Windows and PowerShell is this?`n" - write-output "`n" + Write-Host "What version of Windows and PowerShell is this?`n" + Write-Host "`n" $PSVersionTable [System.Environment]::OSVersion - Write-Output "What version of Hab is this? $((hab --version).split(" ")[1].split("/")[0])" - write-output "`n" + Write-Host "`n" Get-Command Hab - write-output "`n" + Write-Host "`n" # This install fails if Hab isn't on the path when we check for the version. This ensures it is installed Write-Host "--- :habicat: Forcing an install of habitat" Set-ExecutionPolicy Bypass -Scope Process -Force diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml index 9a88eccb06..2e5d100595 100644 --- a/.github/workflows/kitchen.yml +++ b/.github/workflows/kitchen.yml @@ -19,7 +19,7 @@ jobs: - name: 'Install Chef/Ohai from Omnitruck' id: install_chef run: | - . { Invoke-WebRequest -useb https://omnitruck.chef.io/install.ps1 } | Invoke-Expression; Install-Project -project chef -channel current + . { Invoke-WebRequest -useb https://omnitruck.chef.io/install.ps1 } | Invoke-Expression; Install-Project -project chef -channel current -v 17 $env:PATH = "C:\opscode\chef\bin;C:\opscode\chef\embedded\bin;" + $env:PATH chef-client -v ohai -v |