diff --git a/build b/build index c7a8fb61d..c6247c593 100755 --- a/build +++ b/build @@ -61,7 +61,7 @@ if [ ! -z "$PACKAGE" ]; then GEM_SERVER=http://localhost:9000/gems # if still going, then push all debs up - if [[ "$GIT_BRANCH" == *develop* || "$GIT_BRANCH" == *master* || "$GIT_BRANCH" == *release* || "$GIT_BRANCH" == *feature* || "$GIT_BRANCH" == *hotfix* ]]; then + if [[ "$GIT_BRANCH" == *develop* || "$GIT_BRANCH" == *master* || "$GIT_BRANCH" == *release* || "$GIT_BRANCH" == *feature* || "$GIT_BRANCH" == *hotfix* || "$GIT_BRANCH" == "promised_based_api_interation" ]]; then echo "" echo "PUSHING WEB" diff --git a/pb/build_rprotoc b/pb/build_rprotoc index f4c5555b1..84f8ebd66 100755 --- a/pb/build_rprotoc +++ b/pb/build_rprotoc @@ -8,6 +8,8 @@ RUBY_OUT=$TARGET/ruby command -v "bundle" || { echo >&2 "bundle is required but not installed. Skipping ruby protocol buffers."; exit 0; } # creates a bin folder with 'rprotoc' command inside +#echo "skipping creation of binstubs as it breaks bin/ruby-protoc invocation below" +rm Gemfile.lock bundle install --binstubs # die on error at this point