summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn McCrae <john.mccrae@progress.com>2022-07-28 10:39:06 -0700
committerJohn McCrae <john.mccrae@progress.com>2022-08-03 09:06:38 -0700
commite2f8a9c83ac34dfd1a17699beb07f086fac51213 (patch)
tree2415b099d0fd6f8d8f4b58fa48e9bfd559dcda41
parent95c70804c906b1b14b2b1894654cdfc24fc51f29 (diff)
downloadchef-e2f8a9c83ac34dfd1a17699beb07f086fac51213.tar.gz
starting to integrate ruby 3.1 into the builds
Signed-off-by: John McCrae <john.mccrae@progress.com>
-rw-r--r--.expeditor/scripts/ensure-minimum-viable-hab.ps11
-rw-r--r--.expeditor/scripts/verify-plan.ps11
2 files changed, 1 insertions, 1 deletions
diff --git a/.expeditor/scripts/ensure-minimum-viable-hab.ps1 b/.expeditor/scripts/ensure-minimum-viable-hab.ps1
index 12f9014f2c..c8a483544a 100644
--- a/.expeditor/scripts/ensure-minimum-viable-hab.ps1
+++ b/.expeditor/scripts/ensure-minimum-viable-hab.ps1
@@ -4,7 +4,6 @@ if ($hab_version -lt [Version]"0.85.0" ) {
# install-habitat --version 0.85.0.20190916
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'))
- $env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User")
if (-not $?) { throw "Hab version is older than 0.85 and could not update it." }
} else {
Write-Host "--- :habicat: :thumbsup: Minimum required version of Habitat already installed"
diff --git a/.expeditor/scripts/verify-plan.ps1 b/.expeditor/scripts/verify-plan.ps1
index 380a0f3ddb..6fbef95442 100644
--- a/.expeditor/scripts/verify-plan.ps1
+++ b/.expeditor/scripts/verify-plan.ps1
@@ -14,6 +14,7 @@ Write-Host "--- :8ball: :windows: Verifying $Plan"
powershell -File "./.expeditor/scripts/ensure-minimum-viable-hab.ps1"
if (-not $?) { throw "Could not ensure the minimum hab version required is installed." }
+$env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User")
Write-Host "--- :construction: Verifying Git is Installed"
$source = Get-Command -Name Git -Verbose