Commit a50951d7 authored by Stan Hu's avatar Stan Hu

Upgrade Ruby version to 2.6.3

Ruby 2.6 offers better performance and memory usage:
https://www.rubyguides.com/2018/11/ruby-2-6-new-features/

Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/57323
parent 603412af
image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-golang-1.11-git-2.21-chrome-73.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.6.3-golang-1.11-git-2.21-chrome-73.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29"
variables: variables:
MYSQL_ALLOW_EMPTY_PASSWORD: "1" MYSQL_ALLOW_EMPTY_PASSWORD: "1"
......
cloud-native-image: cloud-native-image:
image: ruby:2.5-alpine image: ruby:2.6-alpine
before_script: [] before_script: []
dependencies: [] dependencies: []
stage: post-test stage: post-test
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
gitlab:assets:compile: gitlab:assets:compile:
<<: *assets-compile-cache <<: *assets-compile-cache
extends: .dedicated-no-docs-pull-cache-job extends: .dedicated-no-docs-pull-cache-job
image: dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-git-2.21-chrome-73.0-node-8.x-yarn-1.12-graphicsmagick-1.3.29-docker-18.06.1 image: dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.3-git-2.21-chrome-73.0-node-8.x-yarn-1.12-graphicsmagick-1.3.29-docker-18.06.1
dependencies: dependencies:
- setup-test-env - setup-test-env
services: services:
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
- gitlab-org - gitlab-org
.default-cache: &default-cache .default-cache: &default-cache
key: "debian-stretch-ruby-2.5.3-node-10.x" key: "debian-stretch-ruby-2.6.3-node-10.x"
paths: paths:
- vendor/ruby - vendor/ruby
- .yarn-cache/ - .yarn-cache/
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
.single-script-job-dedicated-runner: .single-script-job-dedicated-runner:
extends: .dedicated-runner extends: .dedicated-runner
image: ruby:2.5-alpine image: ruby:2.6-alpine
stage: test stage: test
cache: {} cache: {}
dependencies: [] dependencies: []
......
package-and-qa: package-and-qa:
image: ruby:2.5-alpine image: ruby:2.6-alpine
stage: qa stage: qa
when: manual when: manual
before_script: [] before_script: []
......
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
.rspec-metadata-pg-10: &rspec-metadata-pg-10 .rspec-metadata-pg-10: &rspec-metadata-pg-10
<<: *rspec-metadata <<: *rspec-metadata
<<: *use-pg-10 <<: *use-pg-10
image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-golang-1.11-git-2.21-chrome-73.0-node-10.x-yarn-1.12-postgresql-10-graphicsmagick-1.3.29" image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-10.x-yarn-1.12-postgresql-10-graphicsmagick-1.3.29"
.rspec-metadata-mysql: &rspec-metadata-mysql .rspec-metadata-mysql: &rspec-metadata-mysql
<<: *rspec-metadata <<: *rspec-metadata
...@@ -108,7 +108,8 @@ ...@@ -108,7 +108,8 @@
- 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 - sed -i "s/gem 'oj', '~> 2.17.4'//" Gemfile
- bundle update google-protobuf grpc - sed -i "s/gem 'bootsnap', '~> 1.0.0'/gem 'bootsnap'/" Gemfile
- bundle update google-protobuf grpc bootsnap
- 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
...@@ -183,7 +184,7 @@ static-analysis: ...@@ -183,7 +184,7 @@ static-analysis:
script: script:
- scripts/static-analysis - scripts/static-analysis
cache: cache:
key: "debian-stretch-ruby-2.5.3-node-10.x-and-rubocop" key: "debian-stretch-ruby-2.6.3-node-10.x-and-rubocop"
paths: paths:
- vendor/ruby - vendor/ruby
- .yarn-cache/ - .yarn-cache/
......
...@@ -54,7 +54,7 @@ build-qa-image: ...@@ -54,7 +54,7 @@ build-qa-image:
- time docker push ${QA_IMAGE} - time docker push ${QA_IMAGE}
.review-build-cng-base: &review-build-cng-base .review-build-cng-base: &review-build-cng-base
image: ruby:2.5-alpine image: ruby:2.6-alpine
stage: test stage: test
when: manual when: manual
before_script: before_script:
......
...@@ -56,7 +56,7 @@ update-tests-metadata: ...@@ -56,7 +56,7 @@ update-tests-metadata:
flaky-examples-check: flaky-examples-check:
extends: .dedicated-runner extends: .dedicated-runner
image: ruby:2.5-alpine image: ruby:2.6-alpine
services: [] services: []
before_script: [] before_script: []
variables: variables:
......
---
title: Upgrade Ruby version to 2.6.3
merge_request: 28117
author:
type: performance
...@@ -289,7 +289,7 @@ jobs inherit it. Gems are installed in `vendor/ruby/` and are cached per-branch: ...@@ -289,7 +289,7 @@ jobs inherit it. Gems are installed in `vendor/ruby/` and are cached per-branch:
# #
# https://gitlab.com/gitlab-org/gitlab-ce/tree/master/lib/gitlab/ci/templates/Ruby.gitlab-ci.yml # https://gitlab.com/gitlab-org/gitlab-ce/tree/master/lib/gitlab/ci/templates/Ruby.gitlab-ci.yml
# #
image: ruby:2.5 image: ruby:2.6
# Cache gems in between builds # Cache gems in between builds
cache: cache:
......
...@@ -163,9 +163,9 @@ Download Ruby and compile it: ...@@ -163,9 +163,9 @@ Download Ruby and compile it:
```sh ```sh
mkdir /tmp/ruby && cd /tmp/ruby mkdir /tmp/ruby && cd /tmp/ruby
curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.5/ruby-2.5.3.tar.gz curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.6/ruby-2.6.3.tar.gz
echo 'f919a9fbcdb7abecd887157b49833663c5c15fda ruby-2.5.3.tar.gz' | shasum -c - && tar xzf ruby-2.5.3.tar.gz echo '2347ed6ca5490a104ebd5684d2b9b5eefa6cd33c ruby-2.6.3.tar.gz' | shasum -c - && tar xzf ruby-2.6.3.tar.gz
cd ruby-2.5.3 cd ruby-2.6.3
./configure --disable-install-rdoc ./configure --disable-install-rdoc
make make
......
...@@ -52,9 +52,9 @@ Download Ruby and compile it: ...@@ -52,9 +52,9 @@ Download Ruby and compile it:
```bash ```bash
mkdir /tmp/ruby && cd /tmp/ruby mkdir /tmp/ruby && cd /tmp/ruby
curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.5/ruby-2.5.3.tar.gz curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.6/ruby-2.6.3.tar.gz
echo 'f919a9fbcdb7abecd887157b49833663c5c15fda ruby-2.5.3.tar.gz' | shasum -c - && tar xzf ruby-2.5.3.tar.gz echo '2347ed6ca5490a104ebd5684d2b9b5eefa6cd33c ruby-2.6.3.tar.gz' | shasum -c - && tar xzf ruby-2.6.3.tar.gz
cd ruby-2.5.3 cd ruby-2.6.3
./configure --disable-install-rdoc ./configure --disable-install-rdoc
make make
......
FROM ruby:2.5-stretch FROM ruby:2.6-stretch
LABEL maintainer "Grzegorz Bizon <grzegorz@gitlab.com>" LABEL maintainer "Grzegorz Bizon <grzegorz@gitlab.com>"
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
......
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