From e9612cbc19dc4590de8cf14597013bd68461bee3 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Tue, 3 Jan 2023 08:43:48 -0600 Subject: [PATCH 1/5] special case debians for this branch --- build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" From cbf348564d314fca54b3bf2bf5d221b786beeec3 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Tue, 3 Jan 2023 14:38:20 -0600 Subject: [PATCH 2/5] Try to fix build --- pb/build_rprotoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pb/build_rprotoc b/pb/build_rprotoc index f4c5555b1..7246671e8 100755 --- a/pb/build_rprotoc +++ b/pb/build_rprotoc @@ -8,7 +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 -bundle install --binstubs +echo "skipping creation of binstubs as it breaks bin/ruby-protoc invocation below" +# bundle install --binstubs # die on error at this point set -e From 7dc640fb8616b93c0b6a4e691066ec8ac8dfac88 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Wed, 4 Jan 2023 08:26:39 -0600 Subject: [PATCH 3/5] debugging build --- pb/build_rprotoc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pb/build_rprotoc b/pb/build_rprotoc index 7246671e8..4639d9ff1 100755 --- a/pb/build_rprotoc +++ b/pb/build_rprotoc @@ -14,6 +14,12 @@ echo "skipping creation of binstubs as it breaks bin/ruby-protoc invocation belo # die on error at this point set -e +echo "curr" +ls -la . +echo "parent" +ls -la .. +echo `pwd` + echo "building ruby protocol buffers" bin/ruby-protoc $PROTO_FILES --proto_path $SRC --ruby_out $RUBY_OUT From d59b83bb42a296799bbbae13f25cdc852727d26c Mon Sep 17 00:00:00 2001 From: Seth Call Date: Wed, 4 Jan 2023 08:43:13 -0600 Subject: [PATCH 4/5] wip --- pb/build_rprotoc | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pb/build_rprotoc b/pb/build_rprotoc index 4639d9ff1..4ee40c624 100755 --- a/pb/build_rprotoc +++ b/pb/build_rprotoc @@ -8,18 +8,12 @@ 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" -# bundle install --binstubs +#echo "skipping creation of binstubs as it breaks bin/ruby-protoc invocation below" +bundle install --binstubs # die on error at this point set -e -echo "curr" -ls -la . -echo "parent" -ls -la .. -echo `pwd` - echo "building ruby protocol buffers" bin/ruby-protoc $PROTO_FILES --proto_path $SRC --ruby_out $RUBY_OUT From b3d4259b0971b4e3ad6da3c3f29ee0166385562a Mon Sep 17 00:00:00 2001 From: Seth Call Date: Wed, 4 Jan 2023 08:44:02 -0600 Subject: [PATCH 5/5] Try removing gemfile.lock --- pb/build_rprotoc | 1 + 1 file changed, 1 insertion(+) diff --git a/pb/build_rprotoc b/pb/build_rprotoc index 4ee40c624..84f8ebd66 100755 --- a/pb/build_rprotoc +++ b/pb/build_rprotoc @@ -9,6 +9,7 @@ command -v "bundle" || { echo >&2 "bundle is required but not installed. Skippi # 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