From 13c6d6eabe70852aeffb7cadfbd170f1cc79fced Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Sat, 7 Apr 2018 22:42:06 -0700 Subject: Bump Ruby to 2.3.7 and git to 2.17.0 in CI image --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e0719221221..5645964678f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.6-golang-1.9-git-2.16-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6" +image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.7-golang-1.9-git-2.17-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6" .dedicated-runner: &dedicated-runner retry: 1 -- cgit v1.2.1 From 63cadbe1ad194e95920a9ece6b3cb7fdffc4d84b Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Mon, 9 Apr 2018 06:46:33 -0700 Subject: Work around Ruby 2.3.7 bug by defining prepended class methods needed for tests --- app/workers/authorized_projects_worker.rb | 8 ++++++++ spec/workers/concerns/waitable_worker_spec.rb | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/app/workers/authorized_projects_worker.rb b/app/workers/authorized_projects_worker.rb index d7e24491516..8fe3619f6ee 100644 --- a/app/workers/authorized_projects_worker.rb +++ b/app/workers/authorized_projects_worker.rb @@ -2,6 +2,14 @@ class AuthorizedProjectsWorker include ApplicationWorker prepend WaitableWorker + # This is a workaround for a Ruby 2.3.7 bug. rspec-mocks cannot restore the + # visibility of prepended modules. See https://github.com/rspec/rspec-mocks/issues/1231 + # for more details. + if Rails.env.test? + def self.bulk_perform_and_wait(args_list, timeout: 10) + end + end + def perform(user_id) user = User.find_by(id: user_id) diff --git a/spec/workers/concerns/waitable_worker_spec.rb b/spec/workers/concerns/waitable_worker_spec.rb index 4af0de86ac9..54ab07981a4 100644 --- a/spec/workers/concerns/waitable_worker_spec.rb +++ b/spec/workers/concerns/waitable_worker_spec.rb @@ -14,6 +14,12 @@ describe WaitableWorker do include ApplicationWorker prepend WaitableWorker + # This is a workaround for a Ruby 2.3.7 bug. rspec-mocks cannot restore + # the visibility of prepended modules. See + # https://github.com/rspec/rspec-mocks/issues/1231 for more details. + def self.bulk_perform_inline(args_list) + end + def perform(i = 0) self.class.counter += i end -- cgit v1.2.1 From e267ac499866c5e06d2a4f405da9ffc6beacafa9 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Mon, 9 Apr 2018 06:47:08 -0700 Subject: Bump .ruby-version from 2.3.6 to 2.3.7 --- .ruby-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index e75da3e63d6..00355e29d11 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.3.6 +2.3.7 -- cgit v1.2.1 From 1776a73881ff0494664be296a7b3ee1932c6e708 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Mon, 9 Apr 2018 06:51:15 -0700 Subject: Bump ruby 2.3.6 cache key and source installation docs --- .gitlab-ci.yml | 4 ++-- doc/install/installation.md | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5645964678f..4659722854e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.7-golang-1.9-git - gitlab-org .default-cache: &default-cache - key: "ruby-2.3.6-with-yarn" + key: "ruby-2.3.7-with-yarn" paths: - vendor/ruby - .yarn-cache/ @@ -571,7 +571,7 @@ static-analysis: script: - scripts/static-analysis cache: - key: "ruby-2.3.6-with-yarn-and-rubocop" + key: "ruby-2.3.7-with-yarn-and-rubocop" paths: - vendor/ruby - .yarn-cache/ diff --git a/doc/install/installation.md b/doc/install/installation.md index 1abbfd78738..3cf6f7b7ddf 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -133,9 +133,10 @@ Remove the old Ruby 1.8 if present: Download Ruby and compile it: mkdir /tmp/ruby && cd /tmp/ruby - curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.3/ruby-2.3.6.tar.gz - echo '4e6a0f828819e15d274ae58485585fc8b7caace0 ruby-2.3.6.tar.gz' | shasum -c - && tar xzf ruby-2.3.6.tar.gz - cd ruby-2.3.6 + curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.3/ruby-2.3.7.tar.gz + echo '540996fec64984ab6099e34d2f5820b14904f15a ruby-2.3.7.tar.gz' | shasum -c - && tar xzf ruby-2.3.7.tar.gz + cd ruby-2.3.7 + ./configure --disable-install-rdoc make sudo make install -- cgit v1.2.1