From 74c0f8e304edee7df162036e459f66abf6cad9d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mislav=20Marohni=C4=87?= Date: Wed, 19 Feb 2020 01:33:03 +0100 Subject: [PATCH 1/5] Test against Ruby 2.7 in CI --- .travis.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.travis.yml b/.travis.yml index dd63c98bd..733ffa07c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,7 @@ rvm: - 2.4.5 - 2.5.3 - 2.6.3 + - 2.7.0 gemfile: - Gemfile - Gemfile.rails3.0 @@ -47,30 +48,40 @@ matrix: gemfile: Gemfile.rails3.0 - rvm: 2.6.3 gemfile: Gemfile.rails3.0 + - rvm: 2.7.0 + gemfile: Gemfile.rails3.0 - rvm: 2.4.5 gemfile: Gemfile.rails3.1 - rvm: 2.5.3 gemfile: Gemfile.rails3.1 - rvm: 2.6.3 gemfile: Gemfile.rails3.1 + - rvm: 2.7.0 + gemfile: Gemfile.rails3.1 - rvm: 2.4.5 gemfile: Gemfile.rails3.2 - rvm: 2.5.3 gemfile: Gemfile.rails3.2 - rvm: 2.6.3 gemfile: Gemfile.rails3.2 + - rvm: 2.7.0 + gemfile: Gemfile.rails3.2 - rvm: 2.4.5 gemfile: Gemfile.rails4.0 - rvm: 2.5.3 gemfile: Gemfile.rails4.0 - rvm: 2.6.3 gemfile: Gemfile.rails4.0 + - rvm: 2.7.0 + gemfile: Gemfile.rails4.0 - rvm: 2.4.5 gemfile: Gemfile.rails4.1 - rvm: 2.5.3 gemfile: Gemfile.rails4.1 - rvm: 2.6.3 gemfile: Gemfile.rails4.1 + - rvm: 2.7.0 + gemfile: Gemfile.rails4.1 - rvm: 1.9.3 gemfile: Gemfile.rails5.0 - rvm: 2.1.8 From eed5b2185bca841cc851c463a838d3638eb55f37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mislav=20Marohni=C4=87?= Date: Wed, 19 Feb 2020 02:04:37 +0100 Subject: [PATCH 2/5] Update Brewfile --- .gitignore | 1 + Brewfile | 4 ++-- script/bootstrap | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 86a332865..b9394d6c9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ Gemfile*.lock +Brewfile.lock.json .bundle doc *.gem diff --git a/Brewfile b/Brewfile index 19fb2360a..e60472da4 100644 --- a/Brewfile +++ b/Brewfile @@ -1,3 +1,3 @@ -brew 'mongodb', restart_service: true -brew 'mysql@5.6', restart_service: true +brew 'mongodb/brew/mongodb-community@4.0', restart_service: true +brew 'mysql@5.7', restart_service: true brew 'postgresql', restart_service: true diff --git a/script/bootstrap b/script/bootstrap index d12493d7b..095820690 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -4,7 +4,7 @@ set -e if type -p brew >/dev/null; then brew bundle --no-upgrade - export PATH="$(brew --prefix mysql@5.6)/bin:$PATH" + export PATH="$(brew --prefix mysql@5.7)/bin:$PATH" while [ ! -e /tmp/mysql.sock ] && [ ! -e /var/run/mysql5/mysqld.sock ]; do echo "Waiting for mysql to start up ..." >&2 From 0cbbe28d9101c704e820785e3325841076551e4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mislav=20Marohni=C4=87?= Date: Wed, 19 Feb 2020 02:06:34 +0100 Subject: [PATCH 3/5] Bump Rails versions --- Gemfile | 2 +- Gemfile.rails4.2 | 2 +- Gemfile.rails5.0 | 2 +- Gemfile.rails5.1 | 2 +- Gemfile.rails5.2 | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index e298521c3..72ec76f42 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -rails_version = '~> 6.0.0' +rails_version = '~> 6.0.2' gem 'activerecord', rails_version gem 'actionpack', rails_version diff --git a/Gemfile.rails4.2 b/Gemfile.rails4.2 index 5d662fec8..c81c2e8c2 100644 --- a/Gemfile.rails4.2 +++ b/Gemfile.rails4.2 @@ -1,6 +1,6 @@ source 'https://rubygems.org' -rails_version = '~> 4.2.8' +rails_version = '~> 4.2.11.1' gem 'activerecord', rails_version gem 'actionpack', rails_version diff --git a/Gemfile.rails5.0 b/Gemfile.rails5.0 index 017567b22..735524a64 100644 --- a/Gemfile.rails5.0 +++ b/Gemfile.rails5.0 @@ -1,6 +1,6 @@ source 'https://rubygems.org' -rails_version = '~> 5.0.3' +rails_version = '~> 5.0.7.2' gem 'activerecord', rails_version gem 'actionpack', rails_version diff --git a/Gemfile.rails5.1 b/Gemfile.rails5.1 index b3d31f821..1b6629a8e 100644 --- a/Gemfile.rails5.1 +++ b/Gemfile.rails5.1 @@ -1,6 +1,6 @@ source 'https://rubygems.org' -rails_version = '~> 5.1.1' +rails_version = '~> 5.1.7' gem 'activerecord', rails_version gem 'actionpack', rails_version diff --git a/Gemfile.rails5.2 b/Gemfile.rails5.2 index 459d0b5ee..98d8b26f4 100644 --- a/Gemfile.rails5.2 +++ b/Gemfile.rails5.2 @@ -1,6 +1,6 @@ source 'https://rubygems.org' -rails_version = '~> 5.2.0' +rails_version = '~> 5.2.4.1' gem 'activerecord', rails_version gem 'actionpack', rails_version From a5274936926ab276e9d716a8c76324ede6ba4b71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mislav=20Marohni=C4=87?= Date: Wed, 19 Feb 2020 02:06:43 +0100 Subject: [PATCH 4/5] Avoid Ruby warning about `Proc.new` --- lib/will_paginate/i18n.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/will_paginate/i18n.rb b/lib/will_paginate/i18n.rb index 3443caf68..df82ba79e 100644 --- a/lib/will_paginate/i18n.rb +++ b/lib/will_paginate/i18n.rb @@ -8,10 +8,10 @@ def self.load_path Dir["#{locale_dir}/*.{rb,yml}"] end - def will_paginate_translate(keys, options = {}) + def will_paginate_translate(keys, options = {}, &block) if defined? ::I18n defaults = Array(keys).dup - defaults << Proc.new if block_given? + defaults << block if block_given? ::I18n.translate(defaults.shift, options.merge(:default => defaults, :scope => :will_paginate)) else key = Array === keys ? keys.first : keys From 8dc3b995ba6502e3f3c8d387bf6737216aa1ad0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mislav=20Marohni=C4=87?= Date: Wed, 19 Feb 2020 02:30:55 +0100 Subject: [PATCH 5/5] Avoid running Rails 4.2 on Ruby 2.7 https://travis-ci.org/mislav/will_paginate/jobs/652263406 --- .travis.yml | 2 ++ script/ci-matrix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 733ffa07c..e408049f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -82,6 +82,8 @@ matrix: gemfile: Gemfile.rails4.1 - rvm: 2.7.0 gemfile: Gemfile.rails4.1 + - rvm: 2.7.0 + gemfile: Gemfile.rails4.2 - rvm: 1.9.3 gemfile: Gemfile.rails5.0 - rvm: 2.1.8 diff --git a/script/ci-matrix b/script/ci-matrix index 35ef21a93..44de51eb8 100755 --- a/script/ci-matrix +++ b/script/ci-matrix @@ -12,7 +12,7 @@ requirements = { 'Gemfile.rails3.2' => Gem::Requirement.new('< 2.4'), 'Gemfile.rails4.0' => Gem::Requirement.new(['< 2.4', '>= 1.9']), 'Gemfile.rails4.1' => Gem::Requirement.new(['< 2.4', '>= 1.9']), - 'Gemfile.rails4.2' => Gem::Requirement.new('>= 1.9'), + 'Gemfile.rails4.2' => Gem::Requirement.new(['>= 1.9', '< 2.7']), 'Gemfile.rails5.0' => Gem::Requirement.new('>= 2.2'), 'Gemfile.rails5.1' => Gem::Requirement.new('>= 2.2'), 'Gemfile.rails5.2' => Gem::Requirement.new('>= 2.2'),