From f197d2a2e382cf40a8b48a85c440848dfc8f78fc Mon Sep 17 00:00:00 2001 From: Ryan Bigg Date: Tue, 4 Jan 2022 09:20:03 +1100 Subject: [PATCH 01/10] Test on Ruby 3.1 & Rails 7.0x --- .github/workflows/ruby.yml | 3 ++- gemfiles/Gemfile.rails-7.0.x | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 gemfiles/Gemfile.rails-7.0.x diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index f1a3a846..c769dbcf 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - ruby_version: ["3.0", 2.7, 2.6, 2.5, 2.4, 2.3, jruby] + ruby_version: [3.1, "3.0", 2.7, 2.6, 2.5, 2.4, 2.3, jruby] gemfile: [ Gemfile, @@ -26,6 +26,7 @@ jobs: gemfiles/Gemfile.rails-5.2.x, gemfiles/Gemfile.rails-6.0.x, gemfiles/Gemfile.rails-6.1.x, + gemfiles/Gemfile.rails-7.0.x, gemfiles/Gemfile.rails-main, ] exclude: diff --git a/gemfiles/Gemfile.rails-7.0.x b/gemfiles/Gemfile.rails-7.0.x new file mode 100644 index 00000000..90ffe74f --- /dev/null +++ b/gemfiles/Gemfile.rails-7.0.x @@ -0,0 +1,13 @@ +source 'https://rubygems.org' + +gemspec :path => '..' + +gem 'activesupport', '~> 7.0' +gem 'mocha', '~> 1.7.0' +gem 'test_declarative', '0.0.6' +gem 'rake' +gem 'minitest', '~> 5.14' + +platforms :mri do + gem 'oj' +end From a4db3ae2c566a2ab0f9002c445c32ad67b74077c Mon Sep 17 00:00:00 2001 From: Ryan Bigg Date: Tue, 4 Jan 2022 09:26:10 +1100 Subject: [PATCH 02/10] Exclude Ruby 2.4 & Rails 7.0 --- .github/workflows/ruby.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index c769dbcf..d609c9b2 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -40,6 +40,9 @@ jobs: - ruby_version: 3.0 gemfile: gemfiles/Gemfile.rails-5.0.x # Ruby 2.6.x is not supported by Rails main + - ruby_version: 2.6 + gemfile: gemfiles/Gemfile.rails-main + # Ruby 2.6.x is not supported by Rails main - ruby_version: 2.6 gemfile: gemfiles/Gemfile.rails-main # Ruby 2.5.x is not supported by Rails main @@ -54,15 +57,18 @@ jobs: # Ruby 2.4.x is not supported by Rails 6.0.x - ruby_version: 2.4 gemfile: gemfiles/Gemfile.rails-6.0.x + # Ruby 2.4.x is not supported by Rails 7.0.x + - ruby_version: 2.4 + gemfile: gemfiles/Gemfile.rails-7.0.x # Ruby 2.3.x is not supported by Rails 6.1.x - ruby_version: 2.3 gemfile: gemfiles/Gemfile.rails-6.1.x - # Ruby 2.3.x is not supported by Rails main - - ruby_version: 2.3 - gemfile: gemfiles/Gemfile.rails-main # Ruby 2.3.x is not supported by Rails 6.0.x - ruby_version: 2.3 gemfile: gemfiles/Gemfile.rails-6.0.x + # Ruby 2.3.x is not supported by Rails main + - ruby_version: 2.3 + gemfile: gemfiles/Gemfile.rails-main # JRuby is not supported by Rails main - ruby_version: jruby gemfile: gemfiles/Gemfile.rails-main From a9b765408e975376d803e66ec180b7f3b5efcaff Mon Sep 17 00:00:00 2001 From: Ryan Bigg Date: Tue, 4 Jan 2022 09:26:40 +1100 Subject: [PATCH 03/10] Exclude Ruby 2.5 & Rails 7.0 --- .github/workflows/ruby.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index d609c9b2..aca2a928 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -48,6 +48,9 @@ jobs: # Ruby 2.5.x is not supported by Rails main - ruby_version: 2.5 gemfile: gemfiles/Gemfile.rails-main + # Ruby 2.5.x is not supported by Rails 7.0 + - ruby_version: 2.5 + gemfile: gemfiles/Gemfile.rails-7.0.x # Ruby 2.4.x is not supported by Rails main - ruby_version: 2.4 gemfile: gemfiles/Gemfile.rails-main From 6a3af1c11424859158beebefc8c506ed49aea027 Mon Sep 17 00:00:00 2001 From: Ryan Bigg Date: Tue, 4 Jan 2022 09:27:40 +1100 Subject: [PATCH 04/10] Exclude Ruby 2.6.x & Rails 7 --- .github/workflows/ruby.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index aca2a928..bdb3c212 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -45,10 +45,13 @@ jobs: # Ruby 2.6.x is not supported by Rails main - ruby_version: 2.6 gemfile: gemfiles/Gemfile.rails-main + # Ruby 2.6.x is not supported by Rails 7.0.x + - ruby_version: 2.6 + gemfile: gemfiles/Gemfile.rails-7.0.x # Ruby 2.5.x is not supported by Rails main - ruby_version: 2.5 gemfile: gemfiles/Gemfile.rails-main - # Ruby 2.5.x is not supported by Rails 7.0 + # Ruby 2.5.x is not supported by Rails 7.0.x - ruby_version: 2.5 gemfile: gemfiles/Gemfile.rails-7.0.x # Ruby 2.4.x is not supported by Rails main From e0d33b18c625a4452625c82da6eb5ed0854f95b4 Mon Sep 17 00:00:00 2001 From: Ryan Bigg Date: Tue, 4 Jan 2022 09:28:57 +1100 Subject: [PATCH 05/10] Exclude Ruby 2.3 & Rails 7.0 --- .github/workflows/ruby.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index bdb3c212..b337650e 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -66,6 +66,9 @@ jobs: # Ruby 2.4.x is not supported by Rails 7.0.x - ruby_version: 2.4 gemfile: gemfiles/Gemfile.rails-7.0.x + # Ruby 2.3.x is not supported by Rails 7.0.x + - ruby_version: 2.3 + gemfile: gemfiles/Gemfile.rails-7.0.x # Ruby 2.3.x is not supported by Rails 6.1.x - ruby_version: 2.3 gemfile: gemfiles/Gemfile.rails-6.1.x From 64916fba1fe60874158a28dc3a1c741b1303aaa9 Mon Sep 17 00:00:00 2001 From: Ryan Bigg Date: Tue, 4 Jan 2022 09:29:39 +1100 Subject: [PATCH 06/10] Improve exclusion readability --- .github/workflows/ruby.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index b337650e..49b932a3 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -33,51 +33,67 @@ jobs: # Ruby 3.x is not supported by Rails 5.2.x - ruby_version: 3.0 gemfile: gemfiles/Gemfile.rails-5.2.x + # Ruby 3.x is not supported by Rails 5.1.x - ruby_version: 3.0 gemfile: gemfiles/Gemfile.rails-5.1.x + # Ruby 3.x is not supported by Rails 5.0.x - ruby_version: 3.0 gemfile: gemfiles/Gemfile.rails-5.0.x + # Ruby 2.6.x is not supported by Rails main - ruby_version: 2.6 gemfile: gemfiles/Gemfile.rails-main + # Ruby 2.6.x is not supported by Rails main - ruby_version: 2.6 gemfile: gemfiles/Gemfile.rails-main + # Ruby 2.6.x is not supported by Rails 7.0.x - ruby_version: 2.6 gemfile: gemfiles/Gemfile.rails-7.0.x + # Ruby 2.5.x is not supported by Rails main - ruby_version: 2.5 gemfile: gemfiles/Gemfile.rails-main + # Ruby 2.5.x is not supported by Rails 7.0.x - ruby_version: 2.5 gemfile: gemfiles/Gemfile.rails-7.0.x + # Ruby 2.4.x is not supported by Rails main - ruby_version: 2.4 gemfile: gemfiles/Gemfile.rails-main + # Ruby 2.4.x is not supported by Rails 6.1.x - ruby_version: 2.4 gemfile: gemfiles/Gemfile.rails-6.1.x + # Ruby 2.4.x is not supported by Rails 6.0.x - ruby_version: 2.4 gemfile: gemfiles/Gemfile.rails-6.0.x + # Ruby 2.4.x is not supported by Rails 7.0.x - ruby_version: 2.4 gemfile: gemfiles/Gemfile.rails-7.0.x + # Ruby 2.3.x is not supported by Rails 7.0.x - ruby_version: 2.3 gemfile: gemfiles/Gemfile.rails-7.0.x + # Ruby 2.3.x is not supported by Rails 6.1.x - ruby_version: 2.3 gemfile: gemfiles/Gemfile.rails-6.1.x + # Ruby 2.3.x is not supported by Rails 6.0.x - ruby_version: 2.3 gemfile: gemfiles/Gemfile.rails-6.0.x + # Ruby 2.3.x is not supported by Rails main - ruby_version: 2.3 gemfile: gemfiles/Gemfile.rails-main + # JRuby is not supported by Rails main - ruby_version: jruby gemfile: gemfiles/Gemfile.rails-main From 6cab6b53738bd79dfce1e3b33a6871ea1d8f0ba7 Mon Sep 17 00:00:00 2001 From: Ryan Bigg Date: Tue, 4 Jan 2022 09:29:59 +1100 Subject: [PATCH 07/10] Exclude Ruby 3.1 & Rails 5.2 --- .github/workflows/ruby.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 49b932a3..d8b4270d 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -30,6 +30,10 @@ jobs: gemfiles/Gemfile.rails-main, ] exclude: + # Ruby 3.1 is not supported by Rails 5.2.x + - ruby_version: 3.1 + gemfile: gemfiles/Gemfile.rails-5.2.x + # Ruby 3.x is not supported by Rails 5.2.x - ruby_version: 3.0 gemfile: gemfiles/Gemfile.rails-5.2.x From 0f008b6e5d3925f17d1965dbf18ab5d17cc2c226 Mon Sep 17 00:00:00 2001 From: Ryan Bigg Date: Tue, 4 Jan 2022 09:30:47 +1100 Subject: [PATCH 08/10] Remove duplicated exclusion --- .github/workflows/ruby.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index d8b4270d..456ff13b 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -50,10 +50,6 @@ jobs: - ruby_version: 2.6 gemfile: gemfiles/Gemfile.rails-main - # Ruby 2.6.x is not supported by Rails main - - ruby_version: 2.6 - gemfile: gemfiles/Gemfile.rails-main - # Ruby 2.6.x is not supported by Rails 7.0.x - ruby_version: 2.6 gemfile: gemfiles/Gemfile.rails-7.0.x From 08554187133882478095a31792e374518892236a Mon Sep 17 00:00:00 2001 From: Ryan Bigg Date: Tue, 4 Jan 2022 09:31:29 +1100 Subject: [PATCH 09/10] Exclude JRuby & Rails 7.0.x --- .github/workflows/ruby.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 456ff13b..931d4376 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -94,6 +94,10 @@ jobs: - ruby_version: 2.3 gemfile: gemfiles/Gemfile.rails-main + # JRuby is not supported by Rails 7.0.x + - ruby_version: jruby + gemfile: gemfiles/Gemfile.rails-7.0.x + # JRuby is not supported by Rails main - ruby_version: jruby gemfile: gemfiles/Gemfile.rails-main From bb565468e24cac376d7761c426e113aa2a914712 Mon Sep 17 00:00:00 2001 From: Ryan Bigg Date: Tue, 4 Jan 2022 09:33:34 +1100 Subject: [PATCH 10/10] Support the last 4 Ruby & 4 Rails versions --- .github/workflows/ruby.yml | 52 +------------------------------------- 1 file changed, 1 insertion(+), 51 deletions(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 931d4376..af8f5770 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -17,12 +17,10 @@ jobs: strategy: fail-fast: false matrix: - ruby_version: [3.1, "3.0", 2.7, 2.6, 2.5, 2.4, 2.3, jruby] + ruby_version: [3.1, "3.0", 2.7, 2.6, jruby] gemfile: [ Gemfile, - gemfiles/Gemfile.rails-5.0.x, - gemfiles/Gemfile.rails-5.1.x, gemfiles/Gemfile.rails-5.2.x, gemfiles/Gemfile.rails-6.0.x, gemfiles/Gemfile.rails-6.1.x, @@ -38,14 +36,6 @@ jobs: - ruby_version: 3.0 gemfile: gemfiles/Gemfile.rails-5.2.x - # Ruby 3.x is not supported by Rails 5.1.x - - ruby_version: 3.0 - gemfile: gemfiles/Gemfile.rails-5.1.x - - # Ruby 3.x is not supported by Rails 5.0.x - - ruby_version: 3.0 - gemfile: gemfiles/Gemfile.rails-5.0.x - # Ruby 2.6.x is not supported by Rails main - ruby_version: 2.6 gemfile: gemfiles/Gemfile.rails-main @@ -54,46 +44,6 @@ jobs: - ruby_version: 2.6 gemfile: gemfiles/Gemfile.rails-7.0.x - # Ruby 2.5.x is not supported by Rails main - - ruby_version: 2.5 - gemfile: gemfiles/Gemfile.rails-main - - # Ruby 2.5.x is not supported by Rails 7.0.x - - ruby_version: 2.5 - gemfile: gemfiles/Gemfile.rails-7.0.x - - # Ruby 2.4.x is not supported by Rails main - - ruby_version: 2.4 - gemfile: gemfiles/Gemfile.rails-main - - # Ruby 2.4.x is not supported by Rails 6.1.x - - ruby_version: 2.4 - gemfile: gemfiles/Gemfile.rails-6.1.x - - # Ruby 2.4.x is not supported by Rails 6.0.x - - ruby_version: 2.4 - gemfile: gemfiles/Gemfile.rails-6.0.x - - # Ruby 2.4.x is not supported by Rails 7.0.x - - ruby_version: 2.4 - gemfile: gemfiles/Gemfile.rails-7.0.x - - # Ruby 2.3.x is not supported by Rails 7.0.x - - ruby_version: 2.3 - gemfile: gemfiles/Gemfile.rails-7.0.x - - # Ruby 2.3.x is not supported by Rails 6.1.x - - ruby_version: 2.3 - gemfile: gemfiles/Gemfile.rails-6.1.x - - # Ruby 2.3.x is not supported by Rails 6.0.x - - ruby_version: 2.3 - gemfile: gemfiles/Gemfile.rails-6.0.x - - # Ruby 2.3.x is not supported by Rails main - - ruby_version: 2.3 - gemfile: gemfiles/Gemfile.rails-main - # JRuby is not supported by Rails 7.0.x - ruby_version: jruby gemfile: gemfiles/Gemfile.rails-7.0.x