Skip to content

Commit

Permalink
CI against Ruby 3.0
Browse files Browse the repository at this point in the history
Follow rubocop#9288.

Ruby 3.0.0 has been released and this Ruby version is available on
`circleci/ruby:3.0` image.

- https://www.ruby-lang.org/en/news/2020/12/25/ruby-3-0-0-released/
- https://hub.docker.com/r/circleci/ruby/tags/
  • Loading branch information
koic committed Dec 29, 2020
1 parent 4114691 commit 3e97959
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 3 deletions.
31 changes: 30 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,29 @@ jobs:
steps:
*rubocop_steps

# Ruby 3.0
ruby-3.0-spec:
docker:
- image: circleci/ruby:3.0
environment:
<<: *common_env
steps:
*spec_steps
ruby-3.0-ascii_spec:
docker:
- image: circleci/ruby:3.0
environment:
<<: *common_env
steps:
*ascii_spec_steps
ruby-3.0-rubocop:
docker:
- image: circleci/ruby:3.0
environment:
<<: *common_env
steps:
*rubocop_steps

# ruby-head (nightly snapshot build)
ruby-head-spec:
docker:
Expand Down Expand Up @@ -219,7 +242,7 @@ jobs:
- run:
name: Upload coverage results to Code Climate
command: |
./tmp/cc-test-reporter sum-coverage tmp/codeclimate.*.json --parts 5 --output tmp/codeclimate.total.json
./tmp/cc-test-reporter sum-coverage tmp/codeclimate.*.json --parts 6 --output tmp/codeclimate.total.json
./tmp/cc-test-reporter upload-coverage --input tmp/codeclimate.total.json
# Miscellaneous tasks
Expand Down Expand Up @@ -261,6 +284,11 @@ workflows:
- cc-setup
- ruby-2.7-ascii_spec
- ruby-2.7-rubocop
- ruby-3.0-spec:
requires:
- cc-setup
- ruby-3.0-ascii_spec
- ruby-3.0-rubocop
- ruby-head-spec:
requires:
- cc-setup
Expand All @@ -278,4 +306,5 @@ workflows:
- ruby-2.5-spec
- ruby-2.6-spec
- ruby-2.7-spec
- ruby-3.0-spec
- jruby-9.2-spec
2 changes: 1 addition & 1 deletion .github/workflows/rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
matrix:
# [ ubuntu, macos, windows ]
os: [ windows ]
ruby: [ 2.4, 2.5, 2.6, 2.7, head ]
ruby: [ '2.4', '2.5', '2.6', '2.7', '3.0', 'head' ]
include:
- { os: windows, ruby: mingw }
exclude:
Expand Down
5 changes: 4 additions & 1 deletion .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ pull_request_rules:
- "status-success=windows 2.5"
- "status-success=windows 2.6"
- "status-success=windows 2.7"
- "status-success=windows 3.0"
- "status-success=windows mingw"
- "status-success=ci/circleci: cc-setup"
- "status-success=ci/circleci: cc-upload-coverage"
Expand All @@ -31,6 +32,9 @@ pull_request_rules:
- "status-success=ci/circleci: ruby-2.7-ascii_spec"
- "status-success=ci/circleci: ruby-2.7-rubocop"
- "status-success=ci/circleci: ruby-2.7-spec"
- "status-success=ci/circleci: ruby-3.0-ascii_spec"
- "status-success=ci/circleci: ruby-3.0-rubocop"
- "status-success=ci/circleci: ruby-3.0-spec"
- "status-success=ci/circleci: ruby-head-ascii_spec"
- "status-success=ci/circleci: ruby-head-rubocop"
- "status-success=ci/circleci: ruby-head-spec"
Expand All @@ -40,4 +44,3 @@ pull_request_rules:
- label=auto-merge
actions:
delete_head_branch: {}

0 comments on commit 3e97959

Please sign in to comment.