From 4ca1f505c2489a0fd247b7e5eadfc59c99817072 Mon Sep 17 00:00:00 2001 From: Igor Fedoronchuk Date: Tue, 7 Apr 2026 21:24:17 +0200 Subject: [PATCH 1/3] Add Rails 8.0.0 to CI matrix Exclude AA 3.2.0 from Rails 8 as it predates Rails 8 support. --- .github/workflows/test.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1994eb3..d65a852 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,8 +11,11 @@ jobs: fail-fast: false matrix: ruby: ['3.2', '3.3', '3.4'] - rails: ['7.1.0', '7.2.0'] + rails: ['7.1.0', '7.2.0', '8.0.0'] activeadmin: ['3.2.0', '3.3.0', '3.4.0', '3.5.1'] + exclude: + - rails: '8.0.0' + activeadmin: '3.2.0' env: RAILS: ${{ matrix.rails }} AA: ${{ matrix.activeadmin }} From f68d54a6bcbcf3c018a9f8de9e21da9ac9d0cb3a Mon Sep 17 00:00:00 2001 From: Igor Fedoronchuk Date: Wed, 8 Apr 2026 08:49:08 +0200 Subject: [PATCH 2/3] Use propshaft instead of sprockets for Rails 8+ --- Gemfile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 165e561..e09f888 100644 --- a/Gemfile +++ b/Gemfile @@ -4,10 +4,16 @@ gemspec default_rails_version = '7.1.0' default_activeadmin_version = '3.2.0' -gem 'rails', "~> #{ENV['RAILS'] || default_rails_version}" +rails_version = ENV['RAILS'] || default_rails_version +gem 'rails', "~> #{rails_version}" gem 'activeadmin', "~> #{ENV['AA'] || default_activeadmin_version}" -gem 'sprockets-rails' -gem 'sass-rails' + +if Gem::Version.new(rails_version) >= Gem::Version.new('8.0.0') + gem 'propshaft' +else + gem 'sprockets-rails' + gem 'sass-rails' +end group :test do gem 'simplecov', require: false From 748251f6d8687992ba495b56d64b0a1e97117980 Mon Sep 17 00:00:00 2001 From: Igor Fedoronchuk Date: Wed, 8 Apr 2026 08:52:35 +0200 Subject: [PATCH 3/3] Revert to sprockets-rails, create manifest.js in rails template for Rails 8 --- Gemfile | 12 +++--------- spec/support/rails_template.rb | 2 ++ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index e09f888..165e561 100644 --- a/Gemfile +++ b/Gemfile @@ -4,16 +4,10 @@ gemspec default_rails_version = '7.1.0' default_activeadmin_version = '3.2.0' -rails_version = ENV['RAILS'] || default_rails_version -gem 'rails', "~> #{rails_version}" +gem 'rails', "~> #{ENV['RAILS'] || default_rails_version}" gem 'activeadmin', "~> #{ENV['AA'] || default_activeadmin_version}" - -if Gem::Version.new(rails_version) >= Gem::Version.new('8.0.0') - gem 'propshaft' -else - gem 'sprockets-rails' - gem 'sass-rails' -end +gem 'sprockets-rails' +gem 'sass-rails' group :test do gem 'simplecov', require: false diff --git a/spec/support/rails_template.rb b/spec/support/rails_template.rb index f12c5ac..682c1c7 100644 --- a/spec/support/rails_template.rb +++ b/spec/support/rails_template.rb @@ -1,3 +1,5 @@ +create_file "app/assets/config/manifest.js", skip: true + generate :model, 'author name:string{10}:uniq last_name:string birthday:date --force' generate :model, 'post title:string:uniq body:text author:references --force'