From 7e0e5e14436eddddf7ce69b65d92b811a32dd9c0 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 17 Nov 2015 16:04:41 +0000 Subject: [PATCH] Update Gemfile.lock, bootstrap. This fixes the build on 10.11 and gives a clean `git status` after `bundle install`. --- Gemfile.lock | 5 ++++- script/bootstrap | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9726ba716..a6a8fee73 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - github-services (1.0.0.ad54999) + github-services (1.0.0.e38ed97) activeresource (~> 4.0.0) addressable (~> 2.3) aws-sdk (~> 1.27) @@ -133,3 +133,6 @@ DEPENDENCIES github-services! minitest rake (= 10.0.3) + +BUNDLED WITH + 1.10.6 diff --git a/script/bootstrap b/script/bootstrap index eed19d95d..c37b09a1c 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -3,5 +3,10 @@ # Ensures all gems are in vendor/cache and installed locally. set -e +if [ "$(uname -s)" = "Darwin" ]; then + HOMEBREW_PREFIX="$(brew --prefix)" + bundle config --local build.eventmachine "--with-cppflags=-I$HOMEBREW_PREFIX/opt/openssl/include" +fi + bundle install --binstubs --local --path=vendor/gems bundle package --all