Skip to content

Commit

Permalink
Merge branch 'main' into test-anonymous-component-mock
Browse files Browse the repository at this point in the history
  • Loading branch information
joelhawksley authored Jan 7, 2025
2 parents 9bbdc5c + 4d455f8 commit 58ce7aa
Show file tree
Hide file tree
Showing 25 changed files with 262 additions and 145 deletions.
18 changes: 16 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ on:
jobs:
benchmark:
runs-on: ubuntu-latest
env:
BUNDLE_GEMFILE: gemfiles/rails_8.0.gemfile
steps:
- uses: actions/[email protected]
- name: Setup Ruby
Expand All @@ -18,8 +20,8 @@ jobs:
bundler-cache: true
- name: Run benchmarks
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
Expand Down Expand Up @@ -51,6 +53,18 @@ jobs:
- ruby_version: "3.3"
rails_version: "7.2"
mode: "capture_patch_enabled"
- ruby_version: "3.3"
rails_version: "8.0"
mode: "capture_patch_disabled"
- ruby_version: "3.3"
rails_version: "8.0"
mode: "capture_patch_enabled"
- ruby_version: "3.4"
rails_version: "8.0"
mode: "capture_patch_disabled"
- ruby_version: "3.4"
rails_version: "8.0"
mode: "capture_patch_enabled"
- ruby_version: "head"
rails_version: "main"
mode: "capture_patch_disabled"
Expand Down
10 changes: 10 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
appraise "rails-6.1" do
gem "rails", "~> 6.1"
gem "tailwindcss-rails", "~> 2.0"
gem "sprockets-rails", "~> 3.4.2"

# Required for Ruby 3.1.0
gem "net-smtp", require: false
Expand All @@ -15,17 +16,26 @@ appraise "rails-7.0" do
gem "rails", "~> 7.0"
gem "tailwindcss-rails", "~> 2.0"
gem "turbo-rails", "~> 1"
gem "sprockets-rails", "~> 3.4.2"
end

appraise "rails-7.1" do
gem "rails", "~> 7.1"
gem "tailwindcss-rails", "~> 2.0"
gem "turbo-rails", "~> 1"
gem "sprockets-rails", "~> 3.4.2"
end

appraise "rails-7.2" do
gem "rails", "~> 7.2"
gem "tailwindcss-rails", "~> 2.0"
gem "sprockets-rails", "~> 3.4.2"
end

appraise "rails-8.0" do
gem "rails", "~> 8.0"
gem "tailwindcss-rails", "~> 2.0"
gem "propshaft", "~> 1.1.0"
end

appraise "rails-main" do
Expand Down
Loading

0 comments on commit 58ce7aa

Please sign in to comment.