summaryrefslogtreecommitdiff
path: root/.expeditor
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2020-12-28 17:33:07 -0800
committerTim Smith <tsmith84@gmail.com>2020-12-30 12:16:27 -0800
commitcb9a4cf4e94f7ffee34910155dbb9942a9f57592 (patch)
tree04ce9a68a862f0d45e0e97b6dfc5845be585a3f9 /.expeditor
parent5fef3d26f65a99fb024c692ae63e089f0bbd6d9c (diff)
downloadchef-cb9a4cf4e94f7ffee34910155dbb9942a9f57592.tar.gz
Throw and error if bunder can't be run on Windows
Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to '.expeditor')
-rwxr-xr-x.expeditor/scripts/bk_container_prep.sh1
-rw-r--r--.expeditor/scripts/bk_win_prep.ps11
2 files changed, 1 insertions, 1 deletions
diff --git a/.expeditor/scripts/bk_container_prep.sh b/.expeditor/scripts/bk_container_prep.sh
index 1f2961da20..5615744000 100755
--- a/.expeditor/scripts/bk_container_prep.sh
+++ b/.expeditor/scripts/bk_container_prep.sh
@@ -11,7 +11,6 @@ if [ -f /etc/debian_version ]; then
touch /etc/network/interfaces
fi
-
# remove default bundler config if there is one
rm -f .bundle/config
diff --git a/.expeditor/scripts/bk_win_prep.ps1 b/.expeditor/scripts/bk_win_prep.ps1
index 243db0f822..b5337d1487 100644
--- a/.expeditor/scripts/bk_win_prep.ps1
+++ b/.expeditor/scripts/bk_win_prep.ps1
@@ -6,6 +6,7 @@ ruby -v
if (-not $?) { throw "Can't run Ruby. Is it installed?" }
bundle --version
+if (-not $?) { throw "Can't run Bundler. Is it installed?" }
echo "--- bundle install"
bundle install --jobs=3 --retry=3 --without omnibus_package