Upgrade to Ruby 2.5.3
Attempt to update google-protobuf for migration-paths Because the one we were using aren't compatible with Ruby 2.5.3, and it'll be troublesome to switch Ruby. Upgrading google-protobuf will be much easier. All of them will need to be updated for Ruby 2.5.3 We remove oj because we don't really need it and it doesn't compile on 2.5.3 with that version. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/41825
This commit is contained in:
parent
314bb5d1cf
commit
1f5dca2d4f
4 changed files with 18 additions and 11 deletions
|
@ -1,4 +1,4 @@
|
||||||
image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.4.5-golang-1.9-git-2.18-chrome-69.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29"
|
image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-golang-1.9-git-2.18-chrome-69.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29"
|
||||||
|
|
||||||
.dedicated-runner: &dedicated-runner
|
.dedicated-runner: &dedicated-runner
|
||||||
retry: 1
|
retry: 1
|
||||||
|
@ -6,7 +6,7 @@ image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.4.5-golang-1.9-git
|
||||||
- gitlab-org
|
- gitlab-org
|
||||||
|
|
||||||
.default-cache: &default-cache
|
.default-cache: &default-cache
|
||||||
key: "debian-stretch-ruby-2.4.5-node-10.x"
|
key: "debian-stretch-ruby-2.5.3-node-10.x"
|
||||||
paths:
|
paths:
|
||||||
- vendor/ruby
|
- vendor/ruby
|
||||||
- .yarn-cache/
|
- .yarn-cache/
|
||||||
|
@ -121,7 +121,7 @@ stages:
|
||||||
<<: *except-docs-and-qa
|
<<: *except-docs-and-qa
|
||||||
|
|
||||||
.single-script-job: &single-script-job
|
.single-script-job: &single-script-job
|
||||||
image: ruby:2.4-alpine
|
image: ruby:2.5-alpine
|
||||||
stage: test
|
stage: test
|
||||||
cache: {}
|
cache: {}
|
||||||
dependencies: []
|
dependencies: []
|
||||||
|
@ -227,6 +227,8 @@ stages:
|
||||||
script:
|
script:
|
||||||
- git fetch https://gitlab.com/gitlab-org/gitlab-ce.git v9.3.0
|
- git fetch https://gitlab.com/gitlab-org/gitlab-ce.git v9.3.0
|
||||||
- git checkout -f FETCH_HEAD
|
- git checkout -f FETCH_HEAD
|
||||||
|
- sed -i "s/gem 'oj', '~> 2.17.4'//" Gemfile
|
||||||
|
- bundle update google-protobuf grpc
|
||||||
- bundle install $BUNDLE_INSTALL_FLAGS
|
- bundle install $BUNDLE_INSTALL_FLAGS
|
||||||
- date
|
- date
|
||||||
- cp config/gitlab.yml.example config/gitlab.yml
|
- cp config/gitlab.yml.example config/gitlab.yml
|
||||||
|
@ -316,7 +318,7 @@ review-docs-cleanup:
|
||||||
# Trigger a docker image build in CNG (Cloud Native GitLab) repository
|
# Trigger a docker image build in CNG (Cloud Native GitLab) repository
|
||||||
#
|
#
|
||||||
cloud-native-image:
|
cloud-native-image:
|
||||||
image: ruby:2.4-alpine
|
image: ruby:2.5-alpine
|
||||||
before_script: []
|
before_script: []
|
||||||
dependencies: []
|
dependencies: []
|
||||||
stage: test
|
stage: test
|
||||||
|
@ -369,7 +371,7 @@ update-tests-metadata:
|
||||||
|
|
||||||
flaky-examples-check:
|
flaky-examples-check:
|
||||||
<<: *dedicated-runner
|
<<: *dedicated-runner
|
||||||
image: ruby:2.4-alpine
|
image: ruby:2.5-alpine
|
||||||
services: []
|
services: []
|
||||||
before_script: []
|
before_script: []
|
||||||
variables:
|
variables:
|
||||||
|
@ -589,7 +591,7 @@ static-analysis:
|
||||||
script:
|
script:
|
||||||
- scripts/static-analysis
|
- scripts/static-analysis
|
||||||
cache:
|
cache:
|
||||||
key: "debian-stretch-ruby-2.4.5-node-10.x-and-rubocop"
|
key: "debian-stretch-ruby-2.5.3-node-10.x-and-rubocop"
|
||||||
paths:
|
paths:
|
||||||
- vendor/ruby
|
- vendor/ruby
|
||||||
- .yarn-cache/
|
- .yarn-cache/
|
||||||
|
@ -696,7 +698,7 @@ gitlab:setup-mysql:
|
||||||
# Frontend-related jobs
|
# Frontend-related jobs
|
||||||
gitlab:assets:compile:
|
gitlab:assets:compile:
|
||||||
<<: *dedicated-no-docs-and-no-qa-pull-cache-job
|
<<: *dedicated-no-docs-and-no-qa-pull-cache-job
|
||||||
image: dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.4.4-git-2.18-chrome-69.0-node-8.x-yarn-1.2-graphicsmagick-1.3.29-docker-18.06.1
|
image: dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-git-2.18-chrome-69.0-node-8.x-yarn-1.2-graphicsmagick-1.3.29-docker-18.06.1
|
||||||
dependencies: []
|
dependencies: []
|
||||||
services:
|
services:
|
||||||
- docker:stable-dind
|
- docker:stable-dind
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
2.4.5
|
2.5.3
|
||||||
|
|
5
changelogs/unreleased/sh-bump-ruby-2-5-3.yml
Normal file
5
changelogs/unreleased/sh-bump-ruby-2-5-3.yml
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Upgrade to Ruby 2.5.3
|
||||||
|
merge_request: 2806
|
||||||
|
author:
|
||||||
|
type: performance
|
|
@ -132,9 +132,9 @@ Remove the old Ruby 1.8 if present:
|
||||||
Download Ruby and compile it:
|
Download Ruby and compile it:
|
||||||
|
|
||||||
mkdir /tmp/ruby && cd /tmp/ruby
|
mkdir /tmp/ruby && cd /tmp/ruby
|
||||||
curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.4/ruby-2.4.5.tar.gz
|
curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.5/ruby-2.5.3.tar.gz
|
||||||
echo '4d650f302f1ec00256450b112bb023644b6ab6dd ruby-2.4.5.tar.gz' | shasum -c - && tar xzf ruby-2.4.5.tar.gz
|
echo 'f919a9fbcdb7abecd887157b49833663c5c15fda ruby-2.5.3.tar.gz' | shasum -c - && tar xzf ruby-2.5.3.tar.gz
|
||||||
cd ruby-2.4.5
|
cd ruby-2.5.3
|
||||||
|
|
||||||
./configure --disable-install-rdoc
|
./configure --disable-install-rdoc
|
||||||
make
|
make
|
||||||
|
|
Loading…
Reference in a new issue