Skip to content

Commit

Permalink
Merge branch '4.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
ddnexus committed Mar 10, 2021
2 parents ef8b4bc + 9005ee6 commit 3a0aafb
Show file tree
Hide file tree
Showing 65 changed files with 874 additions and 2,172 deletions.
8 changes: 6 additions & 2 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
require: rubocop-performance
require:
- rubocop-performance
- rubocop-rake
- rubocop-minitest

AllCops:
TargetRubyVersion: 2.7
TargetRubyVersion: 3.0
NewCops: enable

Layout:
Enabled: false
Expand Down
2 changes: 1 addition & 1 deletion .simplecov
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
if ENV['RUN_SIMPLECOV']
if ENV['RUN_SIMPLECOV'] == 'true'
SimpleCov.command_name 'main'
SimpleCov.start do
add_filter %r{^/test/}
Expand Down
44 changes: 3 additions & 41 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,56 +1,18 @@
---
language: ruby
cache: bundler
gemfile: ci-gemfiles/ruby-others
gemfile: ci-gemfiles/ruby-3.0
script:
- bundle exec rake default
after_success:
- bash <(curl -s https://codecov.io/bash)

matrix:
include:

# ruby
- rvm: 1.9
gemfile: ci-gemfiles/ruby-1.9
- rvm: 2.0
gemfile: ci-gemfiles/ruby-2.0
env:
- ENABLE_OJ=true
- rvm: 2.1
gemfile: ci-gemfiles/ruby-2.0
env:
- ENABLE_OJ=true
- rvm: 2.2
gemfile: ci-gemfiles/ruby-2.0
env:
- ENABLE_OJ=true
- rvm: 2.3
env:
- ENABLE_OJ=true
- rvm: 2.4
env:
- ENABLE_OJ=true
- rvm: 2.5
env:
- ENABLE_OJ=true
- rvm: 2.6
gemfile: ci-gemfiles/ruby-latest
env:
- ENABLE_OJ=true
- rvm: 2.7
gemfile: ci-gemfiles/ruby-latest
- rvm: 3.0
gemfile: ci-gemfiles/ruby-3.0
env:
- ENABLE_OJ=true
- RUN_SIMPLECOV=true
- RUN_RUBOCOP=true
- RUN_CODECOV=true

# jruby
- rvm: jruby-1.7
gemfile: ci-gemfiles/ruby-1.9
#- rvm: jruby-9.0
# gemfile: ci-gemfiles/ruby-2.0
- rvm: jruby-9.1
#- rvm: jruby-9.2

Loading

0 comments on commit 3a0aafb

Please sign in to comment.