Skip to content
Merged
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
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ jobs:
benchmark:
runs-on: ubuntu-latest
env:
BUNDLE_GEMFILE: gemfiles/rails_8.0.gemfile
BUNDLE_GEMFILE: gemfiles/rails_8.1.gemfile
steps:
- uses: actions/checkout@v4.1.1
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.4
ruby-version: 4.0
bundler-cache: true
- name: Run benchmarks
run: |
bundle exec appraisal rails-8.0 rake partial_benchmark
bundle exec appraisal rails-8.0 rake translatable_benchmark
bundle exec appraisal rails-8.1 rake partial_benchmark
bundle exec appraisal rails-8.1 rake translatable_benchmark
test:
name: test (Rails ${{ matrix.rails_version }}, Ruby ${{ matrix.ruby_version }})
runs-on: ubuntu-latest
Expand All @@ -40,7 +40,7 @@ jobs:
rails_version: "7.2"
- ruby_version: "3.4"
rails_version: "8.0"
- ruby_version: "3.4"
- ruby_version: "4.0"
rails_version: "8.1"
- ruby_version: "head"
rails_version: "main"
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.4
ruby-version: 4.0
bundler-cache: true
working-directory: 'view_component'
- uses: actions/setup-node@v4
Expand All @@ -99,7 +99,7 @@ jobs:
bundle --quiet && bundle exec rake
env:
VIEW_COMPONENT_PATH: ../view_component
RAILS_VERSION: '8.0.2'
RAILS_VERSION: '8.1.0'
PARALLEL_WORKERS: '1'
coverage:
needs: test
Expand All @@ -109,7 +109,7 @@ jobs:
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.4
ruby-version: 4.0
bundler-cache: true
- name: Download coverage results
uses: actions/download-artifact@v4.3.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.4
ruby-version: 4.0
- uses: actions/cache@v4
with:
path: vendor/bundle
Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby 3.4.7
ruby 4.0.0
5 changes: 3 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
source "https://rubygems.org"
gemspec

rails_version = (ENV["RAILS_VERSION"] || "~> 8").to_s
rails_version = (ENV["RAILS_VERSION"] || "~> 8.1").to_s

gem "rails", (rails_version == "main") ? {git: "https://github.com/rails/rails", ref: "main"} : rails_version

ruby_version = (ENV["RUBY_VERSION"] || "~> 3.4").to_s
ruby_version = (ENV["RUBY_VERSION"] || "~> 4.0").to_s
ruby ruby_version

group :development, :test do
Expand All @@ -26,6 +26,7 @@ group :development, :test do
gem "m", "~> 1"
gem "method_source", "~> 1"
gem "minitest", "~> 6"
gem "nokogiri", "1.19.0"
gem "propshaft", "~> 1"
gem "puma", ">= 6"
gem "rake", "~> 13"
Expand Down
Loading
Loading