summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Luis Leal Cardoso Junior <andrehjr@gmail.com>2021-12-27 16:00:31 -0300
committerGitHub <noreply@github.com>2021-12-27 16:00:31 -0300
commit82183ed85e6be1cbdf07663720f165512ba1e594 (patch)
treed90880b775aaa4469df376ac92f9894c2d15496a
parent1ed07861f05962b48f0113df5276ac790c681f20 (diff)
parentf7afcd90d1837d471c263d5af457f6098714e427 (diff)
downloadpry-82183ed85e6be1cbdf07663720f165512ba1e594.tar.gz
Merge pull request #2228 from andrehjr/add-ruby-31
Add Ruby 3.1 to CI
-rw-r--r--.github/workflows/test.yml5
-rw-r--r--.rubocop.yml5
2 files changed, 8 insertions, 2 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c722ac1c..4ef34eb3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -19,9 +19,10 @@ jobs:
# Due to https://github.com/actions/runner/issues/849,
# we have to use quotes for '3.0'
- '3.0'
- - head
+ - 3.1
+ # - head is currently broken due to yard support for 3.2.0-dev
- jruby
- - jruby-head
+ # - jruby-head
runs-on: ${{ matrix.os }}
diff --git a/.rubocop.yml b/.rubocop.yml
index 7e302463..c86553e5 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,5 +1,10 @@
inherit_from: .rubocop_todo.yml
+# Prevents Ruby 3.1 incompatibility error. You can enable this cop when Ruby 2.4 support is dropped.
+# See https://github.com/rubocop/rubocop/issues/10258
+Layout/BlockAlignment:
+ Enabled: false
+
Style/NumericPredicate:
Enabled: false