Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
strategy:
fail-fast: false
matrix:
rails-version: ['5.2', '6.1', '7.0']
rails-version: ['5.2', '6.1', '7.2', '8.1']
database: ['mysql', 'postgresql', 'sqlite']
include:
- database: mysql
Expand All @@ -51,9 +51,12 @@ jobs:
- rails-version: '6.1'
ruby-version: '3.0'
bundle-gemfile: gemfiles/rails_6_1.gemfile
- rails-version: '7.0'
- rails-version: '7.2'
ruby-version: '3.2'
bundle-gemfile: gemfiles/rails_7_0.gemfile
bundle-gemfile: gemfiles/rails_7_2.gemfile
- rails-version: '8.1'
ruby-version: '4.0'
bundle-gemfile: gemfiles/rails_8_1.gemfile

env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.bundle-gemfile }}
Expand All @@ -70,10 +73,10 @@ jobs:
- name: Run tests
run: bundle exec rspec --profile 10 --format RspecJunitFormatter --out test_results/rspec.xml --format progress
- name: Upload result
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: rspec_{{ matrix.rails-version }}-${{ matrix.database }}.xml
name: rspec_${{ matrix.rails-version }}-${{ matrix.database }}.xml
path: test_results/rspec.xml
- name: Test Report
uses: dorny/test-reporter@v1
Expand Down
12 changes: 10 additions & 2 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
appraise "rails-5-2" do
gem "rails", "~> 5.2.0"
gem "sqlite3", "~> 1.3", ">= 1.3.6"
end

appraise "rails-6-1" do
gem "rails", "~> 6.1.0"
gem "sqlite3", "~> 1.4"
end

appraise "rails-7-0" do
gem "rails", "~> 7.0.0"
appraise "rails-7-2" do
gem "rails", "~> 7.2.0"
gem "sqlite3", ">= 1.4"
end

appraise "rails-8-1" do
gem "rails", "~> 8.1.0"
gem "sqlite3", ">= 2.1"
end
7 changes: 0 additions & 7 deletions gemfiles/rails_5_0.gemfile

This file was deleted.

1 change: 1 addition & 0 deletions gemfiles/rails_5_2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ source "https://rubygems.org"

gem "rspec_junit_formatter"
gem "rails", "~> 5.2.0"
gem "sqlite3", "~> 1.3", ">= 1.3.6"

gemspec path: "../"
1 change: 1 addition & 0 deletions gemfiles/rails_6_1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ source "https://rubygems.org"

gem "rspec_junit_formatter"
gem "rails", "~> 6.1.0"
gem "sqlite3", "~> 1.4"

gemspec path: "../"
3 changes: 2 additions & 1 deletion gemfiles/rails_7_0.gemfile → gemfiles/rails_7_2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
source "https://rubygems.org"

gem "rspec_junit_formatter"
gem "rails", "~> 7.0.0"
gem "rails", "~> 7.2.0"
gem "sqlite3", ">= 1.4"

gemspec path: "../"
4 changes: 3 additions & 1 deletion gemfiles/rails_5_1.gemfile → gemfiles/rails_8_1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

source "https://rubygems.org"

gem "rails", "~> 5.1.0"
gem "rspec_junit_formatter"
gem "rails", "~> 8.1.0"
gem "sqlite3", ">= 2.1"

gemspec path: "../"
5 changes: 3 additions & 2 deletions persistent_enum.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ['lib']

spec.add_dependency 'activerecord', '>= 5.0', '< 8'
spec.add_dependency 'activesupport', '>= 5.0', '< 8'
spec.add_dependency 'activerecord', '>= 5.0', '< 9'
spec.add_dependency 'activesupport', '>= 5.0', '< 9'

spec.add_dependency 'activerecord-import'

Expand All @@ -29,6 +29,7 @@ Gem::Specification.new do |spec|

spec.add_development_dependency 'appraisal'
spec.add_development_dependency 'mysql2'
spec.add_development_dependency 'ostruct'
spec.add_development_dependency 'pg'
spec.add_development_dependency 'sqlite3'

Expand Down
3 changes: 3 additions & 0 deletions spec/support/helpers/database_helper.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# frozen_string_literal: true

# Work around Rails 6.x bug where "logger" is used without being imported
require 'logger'

require 'yaml'
require 'active_record'

Expand Down
1 change: 1 addition & 0 deletions spec/unit/persistent_enum_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

require 'persistent_enum'
require 'byebug'
require 'ostruct'

require_relative '../spec_helper'

Expand Down