diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 28aa2b3..00f54bf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,17 +13,17 @@ 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 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: @@ -42,17 +42,17 @@ 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 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: diff --git a/Appraisals b/Appraisals index 43dd748..07cd46e 100644 --- a/Appraisals +++ b/Appraisals @@ -1,6 +1,6 @@ -%w(7.0 7.1 7.2 8.0).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/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} 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_8_1.gemfile similarity index 79% rename from gemfiles/rails_7_1.gemfile rename to gemfiles/rails_8_1.gemfile index 35a0ba3..cedb65f 100644 --- a/gemfiles/rails_7_1.gemfile +++ b/gemfiles/rails_8_1.gemfile @@ -2,6 +2,6 @@ source "https://rubygems.org" -gem "rails", "~> 7.1.0" +gem "rails", "~> 8.1.0" gemspec path: "../" diff --git a/relation_to_struct.gemspec b/relation_to_struct.gemspec index b8f1e99..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.1" - spec.add_dependency "activesupport", ">= 7.0", "< 8.1" + spec.add_dependency "activerecord", ">= 7.2", "< 8.2" + spec.add_dependency "activesupport", ">= 7.2", "< 8.2" end