Commit 98c9897a authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch 'sh-update-grpc-for-migrate-from-v12.10.0' into 'master'

[RUN ALL RSPEC] Fix migrate-from-v12.10.0 job not working with Ruby v2.7

See merge request gitlab-org/gitlab!46073
parents dbcf6f37 22aeb3f5
...@@ -285,6 +285,8 @@ db:migrate-from-v12.10.0: ...@@ -285,6 +285,8 @@ db:migrate-from-v12.10.0:
- '[[ -d "ee/" ]] || export TAG_TO_CHECKOUT="v12.10.0"' - '[[ -d "ee/" ]] || export TAG_TO_CHECKOUT="v12.10.0"'
- git fetch https://gitlab.com/gitlab-org/$PROJECT_TO_CHECKOUT.git $TAG_TO_CHECKOUT - git fetch https://gitlab.com/gitlab-org/$PROJECT_TO_CHECKOUT.git $TAG_TO_CHECKOUT
- git checkout -f FETCH_HEAD - git checkout -f FETCH_HEAD
- sed -i -e "s/gem 'grpc', '~> 1.24.0'/gem 'grpc', '~> 1.30.2'/" Gemfile # Update gRPC for Ruby 2.7
- sed -i -e "s/gem 'google-protobuf', '~> 3.8.0'/gem 'google-protobuf', '~> 3.12.0'/" Gemfile
- bundle update google-protobuf grpc bootsnap - bundle update google-protobuf grpc bootsnap
- bundle install $BUNDLE_INSTALL_FLAGS - bundle install $BUNDLE_INSTALL_FLAGS
- date - date
...@@ -397,6 +399,7 @@ rspec:feature-flags: ...@@ -397,6 +399,7 @@ rspec:feature-flags:
- memory-static - memory-static
- memory-on-boot - memory-on-boot
script: script:
- run_timed_command "gem install bundler -v 1.17.3"
- run_timed_command "bundle install --jobs=$(nproc) --path=vendor --retry=3 --quiet --without default development test production puma unicorn kerberos metrics omnibus ed25519" - run_timed_command "bundle install --jobs=$(nproc) --path=vendor --retry=3 --quiet --without default development test production puma unicorn kerberos metrics omnibus ed25519"
- run_timed_command "bundle exec scripts/used-feature-flags" - run_timed_command "bundle exec scripts/used-feature-flags"
# EE/FOSS: default refs (MRs, master, schedules) jobs # # EE/FOSS: default refs (MRs, master, schedules) jobs #
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment