[Fixes #163] Update CI to Ruby 3

rubocop · Jan 1, 2021 · dc28255 · dc28255
1 parent 911132d
commit dc28255
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml
@@ -23,14 +23,14 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu ]
-        ruby: [ 2.4, 2.5, 2.6, 2.7, head ]
+        ruby: [ 2.4, 2.5, 2.6, 2.7, '3.0', head ]
         coverage: [ null ]
         modern: [ null ]
         title: [ null ]
         include:
           - { os: windows, ruby: mingw }
           - { ruby: 2.4, os: ubuntu, coverage: true, title: 'Coverage' }
-          - { ruby: 2.7, os: ubuntu, modern: true, title: 'Specs "modern"' }
+          - { ruby: '3.0', os: ubuntu, modern: true, title: 'Specs "modern"' }
           - { ruby: jruby, os: ubuntu }
           # jruby-head disabled because of: https://github.com/jruby/jruby/issues/6416
           # - { ruby: jruby-head, os: ubuntu }
@@ -84,6 +84,8 @@ jobs:
         ruby: [ 2.4, 2.7 ]
         rubocop: [ 'v0.92.0', master ]
         internal_investigation: [ null ]
+        include:
+          - { rubocop: master, ruby: '3.0', os: ubuntu }
     steps:
       - name: checkout
         uses: actions/checkout@v2
@@ -115,7 +117,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu ]
-        ruby: [ 2.7 ]
+        ruby: [ 3.0 ]
         rubocop: [ master ]
     steps:
       - name: checkout

diff --git a/.mergify.yml b/.mergify.yml
@@ -12,18 +12,20 @@ pull_request_rules:
       - 'status-success=Specs | 2.5'
       - 'status-success=Specs | 2.6'
       - 'status-success=Specs | 2.7'
+      - 'status-success=Specs | 3.0'
       - 'status-success=Specs | head'
       - 'status-success=Specs | mingw'
       - 'status-success=Coverage | 2.4'
-      - 'status-success=Specs "modern" | 2.7'
+      - 'status-success=Specs "modern" | 3.0'
       - 'status-success=Specs | jruby'
       - 'status-success=Specs | truffleruby'
       - 'status-success=Specs | truffleruby-head'
       - 'status-success=Main Gem Specs | RuboCop: v0.92.0 | 2.4'
       - 'status-success=Main Gem Specs | RuboCop: master | 2.4'
       - 'status-success=Main Gem Specs | RuboCop: v0.92.0 | 2.7'
       - 'status-success=Main Gem Specs | RuboCop: master | 2.7'
-      - 'status-success=Coding Style | 2.7'
+      - 'status-success=Main Gem Specs | RuboCop: master | 3.0'
+      - 'status-success=Coding Style | 3.0'
 
   - name: delete head branch after auto-merge
     conditions: