Skip to content

Commit

Permalink
Merge branch 'main' into codemods/v3-slots
Browse files Browse the repository at this point in the history
  • Loading branch information
Spone authored Jun 29, 2023
2 parents 3240607 + a35641e commit cf8a038
Show file tree
Hide file tree
Showing 57 changed files with 572 additions and 207 deletions.
10 changes: 6 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,12 @@ jobs:
run: |
bundle config path vendor/bundle
bundle update
bundle exec rake test spec
# Code-reloading isn't compatible with simplecov, so we need to run once
# to collect coverage, and again to test reloads.
MEASURE_COVERAGE=true bundle exec rake test spec
ENABLE_RELOADING=true bundle exec rake test spec
env:
RAISE_ON_WARNING: 1
MEASURE_COVERAGE: true
RAILS_VERSION: ${{ matrix.rails_version }}
CAPTURE_PATCH_ENABLED: ${{ matrix.mode == 'capture_patch_enabled' && 'true' || 'false' }}
- name: Upload coverage results
Expand All @@ -97,7 +99,7 @@ jobs:
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: 3.1
- uses: actions/setup-node@v3
with:
node-version: 16
Expand All @@ -118,7 +120,7 @@ jobs:
bundle exec rake
env:
VIEW_COMPONENT_PATH: ../view_component
RAILS_VERSION: '~> 6.1.0'
RAILS_VERSION: '7.0.3'
PARALLEL_WORKERS: '1'
coverage:
needs: test
Expand Down
6 changes: 4 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@ gem "rspec-rails", "~> 5"

group :test do
gem "cuprite", "~> 0.8"
gem "puma", "~> 5"
gem "puma", "~> 6"

gem "selenium-webdriver", "~> 4"
gem "selenium-webdriver", "4.9.0" # 4.9.1 requires Ruby 3+
end

if RUBY_VERSION >= "3.1"
gem "net-imap", require: false
gem "net-pop", require: false
gem "net-smtp", require: false
end

gem "debug"
Loading

0 comments on commit cf8a038

Please sign in to comment.