From 6bac04a841c33c414e333c42fbeb49d7b270926d Mon Sep 17 00:00:00 2001 From: Keenan Brock Date: Wed, 23 Oct 2024 19:54:44 -0400 Subject: [PATCH] Drop ruby <6.1 fixup --- .github/workflows/run_test_suite.yml | 18 +----------------- Appraisals | 13 ++++--------- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/.github/workflows/run_test_suite.yml b/.github/workflows/run_test_suite.yml index dd8b0d8e..c0bc7bf2 100644 --- a/.github/workflows/run_test_suite.yml +++ b/.github/workflows/run_test_suite.yml @@ -43,20 +43,7 @@ jobs: # - https://guides.rubyonrails.org/maintenance_policy.html format: [materialized_path, materialized_path2] activerecord: [70, 71, 72] - ruby: [3.2, 3.3] - # additional tests - include: - # EOL 6/2022 (ruby >= 2.2.2, <2.7) - - ruby: 2.6 - activerecord: 52 - # EOL 2023 - - ruby: 2.7 - activerecord: 60 - # rails 6.1 and 7.0 have different ruby versions - - ruby: 2.7 - activerecord: 61 - - ruby: "3.0" - activerecord: 61 + ruby: [3.1, 3.3] env: # for the pg cli (psql, pg_isready) and possibly rails PGHOST: 127.0.0.1 # container is mapping it locally @@ -97,7 +84,6 @@ jobs: UPDATE_STRATEGY: sql run: | bundle exec rake - if: ${{ matrix.activerecord != 52 }} - name: run pg tests (ANCESTRY_COLUMN=ancestry_alt) env: DB: pg @@ -111,8 +97,6 @@ jobs: UPDATE_STRATEGY: sql run: | bundle exec rake - FORMAT=${{ matrix.format }} UPDATE_STRATEGY=sql bundle exec rake - if: ${{ matrix.activerecord != 52 }} - name: run mysql tests env: DB: mysql2 diff --git a/Appraisals b/Appraisals index d6a967cc..3d6585b7 100644 --- a/Appraisals +++ b/Appraisals @@ -3,17 +3,12 @@ # on a mac using: # bundle config --global build.mysql2 "--with-mysql-dir=$(brew --prefix mysql)" -%w[5.2.8 6.0.6 6.1.7 7.0.8 7.1.3 7.2.1].each do |ar_version| +%w[7.0.8 7.1.3 7.2.1].each do |ar_version| appraise "gemfile-#{ar_version.split('.').first(2).join}" do gem 'activerecord', "~> #{ar_version}" - # active record 5.2 uses ruby 2.6 - # active record 6.x uses ruby 2.7 (sometimes 3.0) # so we are targeting the ruby version indirectly through active record - if ar_version < "7.0" - gem "sqlite3", "~> 1.6.9" - else - # sqlite3 v 2.0 is causing trouble with rails - gem "sqlite3", "< 2.0" - end + + # sqlite3 v 2.0 is causing trouble with rails + gem "sqlite3", "< 2.0" end end