wrap all bundle install commands outside docker with check for mac workaround

pull/9553/head
Alexander Polcyn 8 years ago
parent b39eb5302d
commit b7dce2dbc9
  1. 8
      tools/run_tests/artifacts/build_artifact_ruby.sh
  2. 46
      tools/run_tests/helper_scripts/bundle_install_wrapper.sh
  3. 2
      tools/run_tests/helper_scripts/pre_build_ruby.sh

@ -53,13 +53,7 @@ set +ex
rvm use default
gem install bundler --update
if [ "$SYSTEM" == "Darwin" ] ; then
# Workaround for crash during bundle install
# See suggestion in https://github.com/bundler/bundler/issues/3692
BUNDLE_SPECIFIC_PLATFORM=true bundle install
else
bundle install
fi
tools/run_tests/helper_scripts/bundle_install_wrapper.sh
set -ex

@ -0,0 +1,46 @@
#!/bin/bash
# Copyright 2015, Google Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
set -ex
export GRPC_CONFIG=${CONFIG:-opt}
# change to grpc repo root
cd $(dirname $0)/../../..
if [ "$SYSTEM" == "Darwin" ] ; then
# Workaround for crash during bundle install
# See suggestion in https://github.com/bundler/bundler/issues/3692
BUNDLE_SPECIFIC_PLATFORM=true bundle install
else
bundle install
fi

@ -36,4 +36,4 @@ export GRPC_CONFIG=${CONFIG:-opt}
# change to grpc repo root
cd $(dirname $0)/../../..
bundle install
tools/run_tests/helper_scripts/bundle_install_wrapper.sh

Loading…
Cancel
Save