summaryrefslogtreecommitdiff
path: root/.expeditor
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2020-12-28 17:29:12 -0800
committerTim Smith <tsmith84@gmail.com>2020-12-28 17:29:12 -0800
commitf282ad5528563de6aa59d0168dfa7bd4403417a6 (patch)
treef21c15ddeee275ecbecc32fb9d7c12b6e5f56465 /.expeditor
parent7c77689b65467c556c57211382121488c26702b7 (diff)
downloadchef-f282ad5528563de6aa59d0168dfa7bd4403417a6.tar.gz
Stop updating bundler in CI
We don't update it in our builds anymore. We just use the version that's built into Ruby. This omnibus override was only used for CI and we had to match the versions, which was a real pain and pretty pointless. Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to '.expeditor')
-rwxr-xr-x.expeditor/scripts/bk_container_prep.sh7
-rw-r--r--.expeditor/scripts/bk_win_prep.ps18
2 files changed, 2 insertions, 13 deletions
diff --git a/.expeditor/scripts/bk_container_prep.sh b/.expeditor/scripts/bk_container_prep.sh
index 949f75c0d3..1f2961da20 100755
--- a/.expeditor/scripts/bk_container_prep.sh
+++ b/.expeditor/scripts/bk_container_prep.sh
@@ -11,11 +11,8 @@ if [ -f /etc/debian_version ]; then
touch /etc/network/interfaces
fi
-# make sure we have the omnibus_overrides specified version of rubygems / bundler
-echo "--- Install proper bundler"
-gem uninstall bundler -a -x || true
-gem install bundler -v $(grep :bundler omnibus_overrides.rb | cut -d'"' -f2)
-bundle --version
+
+# remove default bundler config if there is one
rm -f .bundle/config
echo "+++ Run tests"
diff --git a/.expeditor/scripts/bk_win_prep.ps1 b/.expeditor/scripts/bk_win_prep.ps1
index 1a09378fee..243db0f822 100644
--- a/.expeditor/scripts/bk_win_prep.ps1
+++ b/.expeditor/scripts/bk_win_prep.ps1
@@ -2,17 +2,9 @@ echo "--- system details"
$Properties = 'Caption', 'CSName', 'Version', 'BuildType', 'OSArchitecture'
Get-CimInstance Win32_OperatingSystem | Select-Object $Properties | Format-Table -AutoSize
-echo "--- update bundler"
-
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" }
bundle --version
echo "--- bundle install"