From 192bc480043c53faa16b18c6bf281f92c0fdd91b Mon Sep 17 00:00:00 2001 From: Joe Rafaniello Date: Tue, 24 Sep 2024 11:20:36 -0400 Subject: [PATCH 1/2] Use core minimum but allow 7.0/7.1/7.2 since core sets upper limit This should be safe to use as is since the core application sets the rails version. This will allow us to test with other versions on master. --- manageiq-postgres_ha_admin.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manageiq-postgres_ha_admin.gemspec b/manageiq-postgres_ha_admin.gemspec index a25de2e..f595ff8 100644 --- a/manageiq-postgres_ha_admin.gemspec +++ b/manageiq-postgres_ha_admin.gemspec @@ -27,7 +27,7 @@ Gem::Specification.new do |spec| spec.required_ruby_version = ">= 2.5.8" - spec.add_runtime_dependency "activesupport", ">=5.0", "<7.1" + spec.add_runtime_dependency "activesupport", ">=7.0.8", "<8.0" spec.add_runtime_dependency "awesome_spawn", "~> 1.4" spec.add_runtime_dependency "manageiq-password", "< 2" spec.add_runtime_dependency "pg" From a82cd584702efef8b3039ef70f0d27087028af4b Mon Sep 17 00:00:00 2001 From: Joe Rafaniello Date: Tue, 24 Sep 2024 12:24:09 -0400 Subject: [PATCH 2/2] Drop end of life rubies and rails and add new versions Ensure we're testing and supporting community supported versions. Drop: * ruby 2.7 * rails 6.0 * rails 6.1 Add: * ruby 3.2 * ruby 3.3 * rails 7.1 * rails 7.2 Note: ruby 3.0 is not difficult to keep maintaining for now but it's on the chopping block. --- .github/workflows/ci.yaml | 10 +++++++--- Gemfile | 10 +++++----- manageiq-postgres_ha_admin.gemspec | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4911c9a..770db6d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,13 +12,17 @@ jobs: strategy: matrix: ruby-version: - - '2.7' - '3.0' - '3.1' + - '3.2' + - '3.3' rails-version: - - '6.0' - - '6.1' - '7.0' + - '7.1' + - '7.2' + exclude: + - ruby-version: '3.0' + rails-version: '7.2' services: postgres: image: manageiq/postgresql:13 diff --git a/Gemfile b/Gemfile index eb7f872..fed14d1 100644 --- a/Gemfile +++ b/Gemfile @@ -5,12 +5,12 @@ gemspec minimum_version = case ENV['TEST_RAILS_VERSION'] - when "6.0" - "~>6.0.4" - when "7.0" - "~>7.0.8" + when "7.2" + "~>7.2.1" + when "7.1" + "~>7.1.4" else - "~>6.1.4" + "~>7.0.8" end gem "activesupport", minimum_version diff --git a/manageiq-postgres_ha_admin.gemspec b/manageiq-postgres_ha_admin.gemspec index f595ff8..111920c 100644 --- a/manageiq-postgres_ha_admin.gemspec +++ b/manageiq-postgres_ha_admin.gemspec @@ -25,7 +25,7 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) } spec.require_paths = ["lib"] - spec.required_ruby_version = ">= 2.5.8" + spec.required_ruby_version = ">= 3.0" spec.add_runtime_dependency "activesupport", ">=7.0.8", "<8.0" spec.add_runtime_dependency "awesome_spawn", "~> 1.4"