Skip to content

Commit

Permalink
update ruby/rails/activeadmin matrix
Browse files Browse the repository at this point in the history
  • Loading branch information
gigorok committed Oct 24, 2023
1 parent 84ebc63 commit 187f82b
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 16 deletions.
25 changes: 14 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,28 @@ jobs:
strategy:
matrix:
ruby:
- 2.5
- 2.6
- 3.0
- 3.1
- 3.2
rails:
- '5.2.0'
- '6.0.0'
- '6.1.0'
- '7.0.0'
- '7.1.0'
activeadmin:
- '2.0.0'
- '2.6.0'
- '2.14.0'
- '3.0.0'
- '3.1.0'
exclude:
- rails: '5.2.0'
activeadmin: '2.6.0'
- rails: '6.0.0'
activeadmin: '2.0.0'
- rails: '7.1.0'
activeadmin: '2.14.0'
- rails: '7.1.0'
activeadmin: '3.0.0'
env:
RAILS: ${{ matrix.rails }}
AA: ${{ matrix.activeadmin }}
steps:
- uses: actions/checkout@v2
- uses: actions/setup-ruby@v1
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
- name: Run tests
Expand Down
7 changes: 4 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,21 @@ source 'https://rubygems.org'
gemspec

group :test do
default_rails_version = '6.0.0'
default_activeadmin_version = '2.6.0'
default_rails_version = '7.0.0'
default_activeadmin_version = '3.0.0'

gem 'rails', "~> #{ENV['RAILS'] || default_rails_version}"
gem 'activeadmin', "~> #{ENV['AA'] || default_activeadmin_version}"

gem 'sprockets-rails', '3.0.4'
gem 'rspec-rails'
gem 'coveralls', require: false # Test coverage website. Go to https://coveralls.io
gem 'coveralls_reborn', require: false # Test coverage website. Go to https://coveralls.io
gem 'sass-rails'
gem 'sqlite3', '~> 1.4.0'
gem 'launchy'
gem 'database_cleaner'
gem 'capybara'
gem 'webdrivers'
gem 'byebug'
gem 'webrick', require: false
end
2 changes: 1 addition & 1 deletion active_admin_datetimepicker.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ Gem::Specification.new do |spec|
spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
spec.require_paths = ["lib"]

spec.add_dependency "activeadmin", ">= 2.0", "< 3.a"
spec.add_dependency "activeadmin", ">= 2.14"
end
2 changes: 1 addition & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
ENV['RAILS'] = Rails.version
ENV['RAILS_ROOT'] = File.expand_path("../rails/rails-#{ENV['RAILS']}", __FILE__)
# Create the test app if it doesn't exists
unless File.exists?(ENV['RAILS_ROOT'])
unless File.exist?(ENV['RAILS_ROOT'])
system 'rake setup'
end

Expand Down

0 comments on commit 187f82b

Please sign in to comment.