From f0e331641dae19799adde701430f26b9a542e308 Mon Sep 17 00:00:00 2001 From: BeatyThomas <89540305+BeatyThomas@users.noreply.github.com> Date: Wed, 22 Oct 2025 11:28:02 -0400 Subject: [PATCH 1/4] update bin/setup docker compose call - change 'docker-compose' to 'docker compose' - remove obsolete 'version' since autodetected now --- bin/setup | 2 +- docker-compose.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/setup b/bin/setup index 4afb8c2..9c0eb39 100755 --- a/bin/setup +++ b/bin/setup @@ -9,4 +9,4 @@ bundle exec appraisal install # Do any other automated setup that you need to do here # Launch a blank postgres image -docker-compose up -d +docker compose up -d diff --git a/docker-compose.yml b/docker-compose.yml index 4a7273a..89e22a0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ -version: "3.3" services: db: image: postgres:${PGVERSION:-16} From 522dd41427aeb1aaa5b65a75426527c798e90943 Mon Sep 17 00:00:00 2001 From: BeatyThomas <89540305+BeatyThomas@users.noreply.github.com> Date: Wed, 22 Oct 2025 11:45:17 -0400 Subject: [PATCH 2/4] Add Rails 8.1 Support --- .github/workflows/ci.yml | 4 ++++ Appraisals | 2 +- gemfiles/rails_8_1.gemfile | 7 +++++++ relation_to_struct.gemspec | 4 ++-- 4 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 gemfiles/rails_8_1.gemfile diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 28aa2b3..56d9d3c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,11 +13,13 @@ jobs: ruby: - "3.2" - "3.3" + - "3.4" gemfile: - rails_7_0 - rails_7_1 - rails_7_2 - rails_8_0 + - rails_8_1 name: PostgreSQL ${{ matrix.pg }} - Ruby ${{ matrix.ruby }} - ${{ matrix.gemfile }} runs-on: ubuntu-latest env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps @@ -42,11 +44,13 @@ jobs: ruby: - "3.2" - "3.3" + - "3.4" gemfile: - rails_7_0 - rails_7_1 - rails_7_2 - rails_8_0 + - rails_8_1 name: SQLite - Ruby ${{ matrix.ruby }} - ${{ matrix.gemfile }} runs-on: ubuntu-latest env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps diff --git a/Appraisals b/Appraisals index 43dd748..decf343 100644 --- a/Appraisals +++ b/Appraisals @@ -1,4 +1,4 @@ -%w(7.0 7.1 7.2 8.0).each do |version| +%w(7.0 7.1 7.2 8.0 8.1).each do |version| appraise "rails-#{version.gsub(/\./, "-")}" do gem "rails", "~> #{version}.0" gem "sqlite3", "~> 1.4" if version == "7.0" diff --git a/gemfiles/rails_8_1.gemfile b/gemfiles/rails_8_1.gemfile new file mode 100644 index 0000000..cedb65f --- /dev/null +++ b/gemfiles/rails_8_1.gemfile @@ -0,0 +1,7 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "~> 8.1.0" + +gemspec path: "../" diff --git a/relation_to_struct.gemspec b/relation_to_struct.gemspec index b8f1e99..6f0e775 100644 --- a/relation_to_struct.gemspec +++ b/relation_to_struct.gemspec @@ -26,6 +26,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency "pry-byebug" spec.add_development_dependency "pg" - spec.add_dependency "activerecord", ">= 7.0", "< 8.1" - spec.add_dependency "activesupport", ">= 7.0", "< 8.1" + spec.add_dependency "activerecord", ">= 7.0", "< 8.2" + spec.add_dependency "activesupport", ">= 7.0", "< 8.2" end From 4ec977095f566762cd79a4e4770425dc743ce14f Mon Sep 17 00:00:00 2001 From: BeatyThomas <89540305+BeatyThomas@users.noreply.github.com> Date: Wed, 22 Oct 2025 14:17:31 -0400 Subject: [PATCH 3/4] bump actions/checkout to latest --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 56d9d3c..0f4327f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v5 - name: Start the postgres container run: docker compose up -d env: @@ -56,7 +56,7 @@ jobs: env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v5 - name: Setup Ruby using .ruby-version file uses: ruby/setup-ruby@v1 with: From 54964a8e0b2df3fbd28b83d668cb82ad53c47f20 Mon Sep 17 00:00:00 2001 From: BeatyThomas <89540305+BeatyThomas@users.noreply.github.com> Date: Sat, 25 Oct 2025 10:46:31 -0400 Subject: [PATCH 4/4] remove EOL rails --- .github/workflows/ci.yml | 4 ---- Appraisals | 4 ++-- gemfiles/rails_7_0.gemfile | 8 -------- gemfiles/rails_7_1.gemfile | 7 ------- relation_to_struct.gemspec | 4 ++-- 5 files changed, 4 insertions(+), 23 deletions(-) delete mode 100644 gemfiles/rails_7_0.gemfile delete mode 100644 gemfiles/rails_7_1.gemfile diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0f4327f..00f54bf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,8 +15,6 @@ jobs: - "3.3" - "3.4" gemfile: - - rails_7_0 - - rails_7_1 - rails_7_2 - rails_8_0 - rails_8_1 @@ -46,8 +44,6 @@ jobs: - "3.3" - "3.4" gemfile: - - rails_7_0 - - rails_7_1 - rails_7_2 - rails_8_0 - rails_8_1 diff --git a/Appraisals b/Appraisals index decf343..07cd46e 100644 --- a/Appraisals +++ b/Appraisals @@ -1,6 +1,6 @@ -%w(7.0 7.1 7.2 8.0 8.1).each do |version| +%w(7.2 8.0 8.1).each do |version| appraise "rails-#{version.gsub(/\./, "-")}" do gem "rails", "~> #{version}.0" - gem "sqlite3", "~> 1.4" if version == "7.0" + gem "sqlite3", "~> 1.4" end end diff --git a/gemfiles/rails_7_0.gemfile b/gemfiles/rails_7_0.gemfile deleted file mode 100644 index 286d6d3..0000000 --- a/gemfiles/rails_7_0.gemfile +++ /dev/null @@ -1,8 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "rails", "~> 7.0.0" -gem "sqlite3", "~> 1.4" - -gemspec path: "../" diff --git a/gemfiles/rails_7_1.gemfile b/gemfiles/rails_7_1.gemfile deleted file mode 100644 index 35a0ba3..0000000 --- a/gemfiles/rails_7_1.gemfile +++ /dev/null @@ -1,7 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "rails", "~> 7.1.0" - -gemspec path: "../" diff --git a/relation_to_struct.gemspec b/relation_to_struct.gemspec index 6f0e775..3a25016 100644 --- a/relation_to_struct.gemspec +++ b/relation_to_struct.gemspec @@ -26,6 +26,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency "pry-byebug" spec.add_development_dependency "pg" - spec.add_dependency "activerecord", ">= 7.0", "< 8.2" - spec.add_dependency "activesupport", ">= 7.0", "< 8.2" + spec.add_dependency "activerecord", ">= 7.2", "< 8.2" + spec.add_dependency "activesupport", ">= 7.2", "< 8.2" end