Merge branch 'bundle-vendor' into 'master'

Install gems into vendor/bundle

See merge request !264

4 files changed, 18 insertions, 1 deletions

diff --git a/.gitignore b/.gitignore
index 786784ded..246cbefb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /config.toml
 /internal/service/ssh/gitaly-*-pack
 /.ruby-bundle
+/ruby/vendor/bundle
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 174c6866b..5a859ef97 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,6 +13,10 @@ verify:
 
 .test_template: &test_definition
   stage: build_test
+  cache:
+    key: gems
+    paths:
+      - ruby/vendor/bundle
   script:
     - go version
     - git version
@@ -20,6 +24,11 @@ verify:
 
 .build_template: &build_definition
   stage: build_test
+  cache:
+    key: gems
+    policy: pull
+    paths:
+      - ruby/vendor/bundle
   script:
     - make
 
@@ -41,6 +50,11 @@ test:default:
 
 cover:
   stage: build_test
+  cache:
+    key: gems
+    policy: pull
+    paths:
+      - ruby/vendor/bundle
   script:
     - make cover
   artifacts:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dce1ec498..c7d9134b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,8 @@ v0.27.0
   https://gitlab.com/gitlab-org/gitaly/merge_requests/260
 - Deprecate Exists RPC in favor of RepositoryExists
   https://gitlab.com/gitlab-org/gitaly/merge_requests/260
+- Install gems into vendor/bundle
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/264
 
 v0.26.0
 
diff --git a/Makefile b/Makefile
index 6ab8d6ea4..b0229d78e 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ build:	.ruby-bundle $(TARGET_SETUP)
 	cp $(foreach cmd,$(COMMANDS),$(BIN_BUILD_DIR)/$(cmd)) $(BUILD_DIR)/
 
 .ruby-bundle:	ruby/Gemfile.lock
-	cd ruby && bundle install
+	cd ruby && bundle install --path vendor/bundle
 	touch $@
 
 .PHONY: install