From 4bb713b84daef1b5a2737c004c7f39c26eae3bc1 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" <pixel@nobis-crew.org> Date: Sat, 6 Feb 2016 02:09:11 +0100 Subject: [PATCH] Last changes to build_artifact_ruby.sh --- tools/run_tests/build_artifact_ruby.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tools/run_tests/build_artifact_ruby.sh b/tools/run_tests/build_artifact_ruby.sh index 8033c3157a..69e4dcf85a 100755 --- a/tools/run_tests/build_artifact_ruby.sh +++ b/tools/run_tests/build_artifact_ruby.sh @@ -28,12 +28,17 @@ # (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 + +SYSTEM=`uname | cut -f 1 -d_` + cd $(dirname $0)/../.. +if [ "$SYSTEM" == "Darwin" ] ; then + ./tools/distrib/build_ruby_environment_macos.sh +fi set +ex [[ -s /etc/profile.d/rvm.sh ]] && . /etc/profile.d/rvm.sh set -ex -SYSTEM=`uname | cut -f 1 -d_` if [ "$SYSTEM" == "MSYS" ] ; then SYSTEM=MINGW32 fi @@ -52,11 +57,9 @@ if [ "$SYSTEM" == "Darwin" ] ; then set -ex fi -if [ "$SYSTEM" == "Linux" ] ; then - set +ex - ${SETARCH_CMD} bundle install - set -ex -fi +set +ex +${SETARCH_CMD} bundle install +set -ex ${SETARCH_CMD} rake gem:native -- GitLab