[GitHub] merlimat closed pull request #1155: Fix bundler version error

[GitBox <gi...@apache.org>]

merlimat closed pull request #1155: Fix bundler version error
URL: https://github.com/apache/incubator-pulsar/pull/1155
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/site/Makefile b/site/Makefile
index 6fb14f718..911de7369 100644
--- a/site/Makefile
+++ b/site/Makefile
@@ -1,5 +1,4 @@
-BUNDLER_VERSION = 1.16
-BUNDLE = bundle _$(BUNDLER_VERSION)_
+BUNDLE = bundle
 JEKYLL = $(BUNDLE) exec jekyll
 
 deep_clean:
@@ -24,7 +23,6 @@ clean_local:
 
 ruby_setup:
 	gem install bundler \
-		-v $(BUNDLER_VERSION) \
 		--no-rdoc \
 		--no-ri
 	NOKOGIRI_USE_SYSTEM_LIBRARIES=true $(BUNDLE) install \
diff --git a/site/scripts/build-all-versions.sh b/site/scripts/build-all-versions.sh
index 2997b19ef..2fcd0a520 100755
--- a/site/scripts/build-all-versions.sh
+++ b/site/scripts/build-all-versions.sh
@@ -19,9 +19,7 @@
 #
 
 
-BUNDLER_VERSION=1.15.1
-
 for version in $(cat VERSIONS); do
-  JEKYLL_ENV=production bundle _${BUNDLER_VERSION}_ exec jekyll build \
+  JEKYLL_ENV=production bundle exec jekyll build \
     --config _config.yml,docs/$version/_config.version.yml
 done


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services