From 8bfb993a1b1eaa33482f89fd405ab004d895d025 Mon Sep 17 00:00:00 2001 From: Tristan Starck Date: Wed, 19 Feb 2025 14:38:23 -0800 Subject: [PATCH 1/4] Remove old Rails < 7 gemfiles --- Appraisals | 2 +- abc.txt.tmp | 0 gemfiles/rails_6_0.gemfile | 18 ------------------ gemfiles/rails_6_1.gemfile | 18 ------------------ 4 files changed, 1 insertion(+), 37 deletions(-) create mode 100644 abc.txt.tmp delete mode 100644 gemfiles/rails_6_0.gemfile delete mode 100644 gemfiles/rails_6_1.gemfile diff --git a/Appraisals b/Appraisals index df4ec91..b04dac4 100644 --- a/Appraisals +++ b/Appraisals @@ -2,6 +2,6 @@ require 'appraisal/matrix' -appraisal_matrix(rails: "6.0") do +appraisal_matrix(rails: "7.0") do gem 'sqlite3', '~> 1.4' end diff --git a/abc.txt.tmp b/abc.txt.tmp new file mode 100644 index 0000000..e69de29 diff --git a/gemfiles/rails_6_0.gemfile b/gemfiles/rails_6_0.gemfile deleted file mode 100644 index 5b78cf0..0000000 --- a/gemfiles/rails_6_0.gemfile +++ /dev/null @@ -1,18 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "appraisal" -gem "appraisal-matrix" -gem "pry" -gem "rake" -gem "sqlite3", "~> 1.4" -gem "minitest" -gem "minitest-reporters" -gem "concurrent-ruby", "~> 1.3", "< 1.3.5" -gem "base64", ">= 0.2.0" -gem "bigdecimal", ">= 3.1" -gem "mutex_m", ">= 0.2.0" -gem "rails", "~> 6.0.0" - -gemspec path: "../" diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile deleted file mode 100644 index 41f49cb..0000000 --- a/gemfiles/rails_6_1.gemfile +++ /dev/null @@ -1,18 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "appraisal" -gem "appraisal-matrix" -gem "pry" -gem "rake" -gem "sqlite3", "~> 1.4" -gem "minitest" -gem "minitest-reporters" -gem "concurrent-ruby", "~> 1.3", "< 1.3.5" -gem "base64", ">= 0.2.0" -gem "bigdecimal", ">= 3.1" -gem "mutex_m", ">= 0.2.0" -gem "rails", "~> 6.1.0" - -gemspec path: "../" From 3be76ab8a1b6898154d0c1c0bc881f8d1faf4b40 Mon Sep 17 00:00:00 2001 From: Tristan Starck Date: Wed, 19 Feb 2025 14:43:05 -0800 Subject: [PATCH 2/4] remove tmp file --- abc.txt.tmp | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 abc.txt.tmp diff --git a/abc.txt.tmp b/abc.txt.tmp deleted file mode 100644 index e69de29..0000000 From a14a95b679e830db2d57b612e6268d69b4c0ceb4 Mon Sep 17 00:00:00 2001 From: Tristan Starck Date: Wed, 19 Feb 2025 15:36:00 -0800 Subject: [PATCH 3/4] fix build.yml --- .github/workflows/build.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 784213b..19c7dc6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,12 +8,15 @@ jobs: strategy: fail-fast: false matrix: - ruby: [3.1, 3.2, 3.3] + ruby: [3.1, 3.2, 3.3, 3.4] gemfile: - - gemfiles/rails_6_0.gemfile - - gemfiles/rails_6_1.gemfile - gemfiles/rails_7_0.gemfile - gemfiles/rails_7_1.gemfile + - gemfiles/rails_7_2.gemfile + - gemfiles/rails_8_0.gemfile + exclude: + - ruby: 3.1 + gemfile: gemfiles/rails_8_0.gemfile env: BUNDLE_GEMFILE: ${{ matrix.gemfile }} steps: From d7ea9282ccfb3785a2ade40d345a35ebd945e080 Mon Sep 17 00:00:00 2001 From: Tristan Starck Date: Thu, 20 Feb 2025 09:21:41 -0800 Subject: [PATCH 4/4] limit sqlite for rails 7.0 --- Appraisals | 8 ++++++-- Gemfile.lock | 4 ++-- gemfiles/rails_7_1.gemfile | 2 +- gemfiles/rails_7_2.gemfile | 2 +- gemfiles/rails_8_0.gemfile | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Appraisals b/Appraisals index b04dac4..cf92af9 100644 --- a/Appraisals +++ b/Appraisals @@ -2,6 +2,10 @@ require 'appraisal/matrix' -appraisal_matrix(rails: "7.0") do - gem 'sqlite3', '~> 1.4' +appraisal_matrix(rails: "7.0") do |rails:| + if rails <= "7.0" + gem 'sqlite3', '~> 1.4' + else + gem 'sqlite3' + end end diff --git a/Gemfile.lock b/Gemfile.lock index 2f74c27..0dcb3ab 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -86,7 +86,7 @@ GEM bundler rake thor (>= 0.14.0) - appraisal-matrix (0.1.0) + appraisal-matrix (0.3.0) appraisal (~> 2.2) base64 (0.2.0) bigdecimal (3.1.8) @@ -193,7 +193,7 @@ GEM sqlite3 (1.7.3-x86_64-darwin) sqlite3 (1.7.3-x86_64-linux) stringio (3.1.1) - thor (1.3.1) + thor (1.3.2) timeout (0.4.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) diff --git a/gemfiles/rails_7_1.gemfile b/gemfiles/rails_7_1.gemfile index f88f1f2..a43282f 100644 --- a/gemfiles/rails_7_1.gemfile +++ b/gemfiles/rails_7_1.gemfile @@ -6,7 +6,7 @@ gem "appraisal" gem "appraisal-matrix" gem "pry" gem "rake" -gem "sqlite3", "~> 1.4" +gem "sqlite3" gem "minitest" gem "minitest-reporters" gem "concurrent-ruby", "~> 1.3", "< 1.3.5" diff --git a/gemfiles/rails_7_2.gemfile b/gemfiles/rails_7_2.gemfile index 85c22c1..f61340b 100644 --- a/gemfiles/rails_7_2.gemfile +++ b/gemfiles/rails_7_2.gemfile @@ -6,7 +6,7 @@ gem "appraisal" gem "appraisal-matrix" gem "pry" gem "rake" -gem "sqlite3", "~> 1.4" +gem "sqlite3" gem "minitest" gem "minitest-reporters" gem "concurrent-ruby", "~> 1.3", "< 1.3.5" diff --git a/gemfiles/rails_8_0.gemfile b/gemfiles/rails_8_0.gemfile index 647808a..4d983be 100644 --- a/gemfiles/rails_8_0.gemfile +++ b/gemfiles/rails_8_0.gemfile @@ -6,7 +6,7 @@ gem "appraisal" gem "appraisal-matrix" gem "pry" gem "rake" -gem "sqlite3", "~> 1.4" +gem "sqlite3" gem "minitest" gem "minitest-reporters" gem "concurrent-ruby", "~> 1.3", "< 1.3.5"