summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2020-05-21 16:44:15 -0700
committerTim Smith <tsmith84@gmail.com>2020-05-21 16:44:15 -0700
commitb439224386f9f553004accd31f349ad06be112d7 (patch)
tree5846888c18e06f89f3237209efa749a0150ea055
parentff18af1be4eab0d3a8ea65f94a8d548aaab0289e (diff)
downloadchef-bump_deps_15.tar.gz
Don't update bundler on Windowsbump_deps_15
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--scripts/bk_tests/bk_win_prep.ps112
1 files changed, 3 insertions, 9 deletions
diff --git a/scripts/bk_tests/bk_win_prep.ps1 b/scripts/bk_tests/bk_win_prep.ps1
index 1d7199916b..6d7687cdc0 100644
--- a/scripts/bk_tests/bk_win_prep.ps1
+++ b/scripts/bk_tests/bk_win_prep.ps1
@@ -2,18 +2,12 @@ echo "--- system details"
$Properties = 'Caption', 'CSName', 'Version', 'BuildType', 'OSArchitecture'
Get-CimInstance Win32_OperatingSystem | Select-Object $Properties | Format-Table -AutoSize
-echo "--- update bundler"
-
+echo "Ruby version:"
ruby -v
if (-not $?) { throw "Can't run Ruby. Is it installed?" }
-
-$env:BUNDLER_VERSION=$(findstr bundler omnibus_overrides.rb | %{ $_.split(" ")[3] })
-$env:BUNDLER_VERSION=($env:BUNDLER_VERSION -replace '"', "")
-echo $env:BUNDLER_VERSION
-
-gem install bundler -v $env:BUNDLER_VERSION --force --no-document --quiet
-if (-not $?) { throw "Unable to update Bundler" }
+echo "Bundler version:"
bundle --version
+if (-not $?) { throw "Can't run Bundler. Is it installed?" }
echo "--- bundle install"
bundle install --jobs=3 --retry=3 --without omnibus_package docgen chefstyle