From 56441b082f0d39a1d44c382f632979da985d8287 Mon Sep 17 00:00:00 2001 From: reeganviljoen Date: Tue, 19 Nov 2024 21:50:29 +0200 Subject: [PATCH] fix ci --- .github/workflows/ci.yml | 6 ++---- gemfiles/rails_8.0.gemfile | 1 + gemfiles/rails_main.gemfile | 1 + test/sandbox/config/application.rb | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ed986a845..dc0fa6f78 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,11 +17,9 @@ jobs: ruby-version: 3.3 bundler-cache: true - name: Run benchmarks - env: - BENCHMARK: true run: | - bundle exec rake partial_benchmark - bundle exec rake translatable_benchmark + bundle exec appraisal rails-8.0 rake partial_benchmark + bundle exec appraisal rails-8.0 rake translatable_benchmark test: name: test (${{ matrix.rails_version }}, ${{ matrix.ruby_version }}, ${{ matrix.mode }}) runs-on: ubuntu-latest diff --git a/gemfiles/rails_8.0.gemfile b/gemfiles/rails_8.0.gemfile index 6262f9017..6280d60ba 100644 --- a/gemfiles/rails_8.0.gemfile +++ b/gemfiles/rails_8.0.gemfile @@ -5,5 +5,6 @@ source "https://rubygems.org" gem "rails", "~> 8.0" gem "tailwindcss-rails", "~> 2.0" gem "turbo-rails", "~> 1" +gem "propshaft", "~> 1.1.0" gemspec path: "../" diff --git a/gemfiles/rails_main.gemfile b/gemfiles/rails_main.gemfile index 7a2bff157..5c92f2cf5 100644 --- a/gemfiles/rails_main.gemfile +++ b/gemfiles/rails_main.gemfile @@ -5,5 +5,6 @@ source "https://rubygems.org" gem "rails", github: "rails/rails", branch: "main" gem "tailwindcss-rails", "~> 2.0" gem "turbo-rails", "~> 1" +gem "propshaft", "~> 1.1.0" gemspec path: "../" diff --git a/test/sandbox/config/application.rb b/test/sandbox/config/application.rb index d9a514e47..6a8ced48d 100644 --- a/test/sandbox/config/application.rb +++ b/test/sandbox/config/application.rb @@ -7,7 +7,8 @@ require "action_controller/railtie" require "action_mailer/railtie" require "action_view/railtie" -require "sprockets/railtie" if Rails.version.to_f < 8.0 && !ENV["BENCHMARK"].present? +require "sprockets/railtie" if Rails.version.to_f < 8.0 +binding.irb require "propshaft" if Rails.version.to_f >= 8.0 require "turbo-rails"