diff options
author | Stan Hu <stanhu@gmail.com> | 2019-05-06 03:35:35 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-05-08 06:21:14 -0700 |
commit | a50951d73a973efddf3079b38a99ded3e885f568 (patch) | |
tree | 39fc2b357ab97aab3c765a9e6b1b2ad27c1d859f /.gitlab | |
parent | 603412af27346f1541971c674b97d8dbf2429dd0 (diff) | |
download | gitlab-ce-a50951d73a973efddf3079b38a99ded3e885f568.tar.gz |
Upgrade Ruby version to 2.6.3sh-upgrade-ruby-2.6.3-ce
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
Diffstat (limited to '.gitlab')
-rw-r--r-- | .gitlab/ci/cng.gitlab-ci.yml | 2 | ||||
-rw-r--r-- | .gitlab/ci/frontend.gitlab-ci.yml | 2 | ||||
-rw-r--r-- | .gitlab/ci/global.gitlab-ci.yml | 4 | ||||
-rw-r--r-- | .gitlab/ci/qa.gitlab-ci.yml | 2 | ||||
-rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 7 | ||||
-rw-r--r-- | .gitlab/ci/review.gitlab-ci.yml | 2 | ||||
-rw-r--r-- | .gitlab/ci/test-metadata.gitlab-ci.yml | 2 |
7 files changed, 11 insertions, 10 deletions
diff --git a/.gitlab/ci/cng.gitlab-ci.yml b/.gitlab/ci/cng.gitlab-ci.yml index c384bcdcdfc..d624e8d09f6 100644 --- a/.gitlab/ci/cng.gitlab-ci.yml +++ b/.gitlab/ci/cng.gitlab-ci.yml @@ -1,5 +1,5 @@ cloud-native-image: - image: ruby:2.5-alpine + image: ruby:2.6-alpine before_script: [] dependencies: [] stage: post-test diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index fbf8925e30a..986ba7558d5 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -16,7 +16,7 @@ gitlab:assets:compile: <<: *assets-compile-cache 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: - setup-test-env services: diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml index 466c47b37c7..cf87f5eb39c 100644 --- a/.gitlab/ci/global.gitlab-ci.yml +++ b/.gitlab/ci/global.gitlab-ci.yml @@ -9,7 +9,7 @@ - gitlab-org .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: - vendor/ruby - .yarn-cache/ @@ -47,7 +47,7 @@ .single-script-job-dedicated-runner: extends: .dedicated-runner - image: ruby:2.5-alpine + image: ruby:2.6-alpine stage: test cache: {} dependencies: [] diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml index 85c6409186e..122ed622ee2 100644 --- a/.gitlab/ci/qa.gitlab-ci.yml +++ b/.gitlab/ci/qa.gitlab-ci.yml @@ -1,5 +1,5 @@ package-and-qa: - image: ruby:2.5-alpine + image: ruby:2.6-alpine stage: qa when: manual before_script: [] diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index 35c5f67427e..29534e40a14 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -86,7 +86,7 @@ .rspec-metadata-pg-10: &rspec-metadata-pg-10 <<: *rspec-metadata <<: *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 @@ -108,7 +108,8 @@ - git fetch https://gitlab.com/gitlab-org/gitlab-ce.git v9.3.0 - git checkout -f FETCH_HEAD - 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 - date - cp config/gitlab.yml.example config/gitlab.yml @@ -183,7 +184,7 @@ static-analysis: script: - scripts/static-analysis 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: - vendor/ruby - .yarn-cache/ diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml index ae16549ef6b..3a024c44fe2 100644 --- a/.gitlab/ci/review.gitlab-ci.yml +++ b/.gitlab/ci/review.gitlab-ci.yml @@ -54,7 +54,7 @@ build-qa-image: - time docker push ${QA_IMAGE} .review-build-cng-base: &review-build-cng-base - image: ruby:2.5-alpine + image: ruby:2.6-alpine stage: test when: manual before_script: diff --git a/.gitlab/ci/test-metadata.gitlab-ci.yml b/.gitlab/ci/test-metadata.gitlab-ci.yml index 3ba7af956b5..4b595083ec6 100644 --- a/.gitlab/ci/test-metadata.gitlab-ci.yml +++ b/.gitlab/ci/test-metadata.gitlab-ci.yml @@ -56,7 +56,7 @@ update-tests-metadata: flaky-examples-check: extends: .dedicated-runner - image: ruby:2.5-alpine + image: ruby:2.6-alpine services: [] before_script: [] variables: |