Merge branch 'sh-bundle-install-no-development-gems' into 'master'

Exclude development gems from CI builds

See merge request gitlab-org/gitlab!37023

.gitlab/ci/global.gitlab-ci.yml

@@ -18,7 +18,7 @@
 
 .rails-cache:
   cache:
-    key: "rails-v1"
+    key: "rails-v2"
     paths:
       - vendor/ruby/
       - vendor/gitaly-ruby/

Gemfile

@@ -337,7 +337,6 @@ group :development do
   gem 'danger', '~> 6.0', require: false
 
   gem 'letter_opener_web', '~> 1.3.4'
-  gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
 
   # Better errors handler
   gem 'better_errors', '~> 2.5.0'
@@ -390,6 +389,8 @@ group :development, :test do
   gem 'png_quantizator', '~> 0.2.1', require: false
 
   gem 'parallel', '~> 1.19', require: false
+
+  gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
 end
 
 # Gems required in omnibus-gitlab pipeline

scripts/prepare_build.sh

@@ -2,7 +2,7 @@
 
 export SETUP_DB=${SETUP_DB:-true}
 export USE_BUNDLE_INSTALL=${USE_BUNDLE_INSTALL:-true}
-export BUNDLE_INSTALL_FLAGS="--without=production --jobs=$(nproc) --path=vendor --retry=3 --quiet"
+export BUNDLE_INSTALL_FLAGS="--without=production --without=development --jobs=$(nproc) --path=vendor --retry=3 --quiet"
 
 if [ "$USE_BUNDLE_INSTALL" != "false" ]; then
   bundle --version