Skip to content

Commit

Permalink
Merge pull request rubocop#10183 from koic/ci_against_jruby_9_3
Browse files Browse the repository at this point in the history
CI against JRuby 9.3
  • Loading branch information
koic committed Oct 13, 2021
2 parents 4ca0721 + 2d6507f commit e9c339b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
22 changes: 11 additions & 11 deletions .circleci/config.yml
Expand Up @@ -161,26 +161,26 @@ jobs:
steps:
*rubocop_steps

# JRuby 9.2
jruby-9.2-spec:
# JRuby 9.3
jruby-9.3-spec:
docker:
- image: circleci/jruby:9.2
- image: circleci/jruby:9.3
environment:
<<: *common_env
<<: *jruby_env
steps:
*spec_steps
jruby-9.2-ascii_spec:
jruby-9.3-ascii_spec:
docker:
- image: circleci/jruby:9.2
- image: circleci/jruby:9.3
environment:
<<: *common_env
<<: *jruby_env
steps:
*ascii_spec_steps
jruby-9.2-rubocop:
jruby-9.3-rubocop:
docker:
- image: circleci/jruby:9.2
- image: circleci/jruby:9.3
environment:
<<: *common_env
<<: *jruby_env
Expand Down Expand Up @@ -266,16 +266,16 @@ workflows:
- cc-setup
- ruby-head-ascii_spec
- ruby-head-rubocop
- jruby-9.2-spec:
- jruby-9.3-spec:
requires:
- cc-setup
- jruby-9.2-ascii_spec
- jruby-9.2-rubocop
- jruby-9.3-ascii_spec
- jruby-9.3-rubocop

- cc-upload-coverage:
requires:
- ruby-2.5-spec
- ruby-2.6-spec
- ruby-2.7-spec
- ruby-3.0-spec
- jruby-9.2-spec
- jruby-9.3-spec
2 changes: 1 addition & 1 deletion spec/spec_helper.rb
Expand Up @@ -74,7 +74,7 @@
config.filter_run_excluding broken_on: :ruby_head
end

if %w[jruby-9.2-ascii_spec jruby-9.2-spec].include? ENV['CIRCLE_STAGE']
if %w[jruby-9.3-ascii_spec jruby-9.3-spec].include? ENV['CIRCLE_STAGE']
config.filter_run_excluding broken_on: :jruby
end
end
Expand Down

0 comments on commit e9c339b

Please sign in to comment.