Merge branch 'master' of https://github.com/ruby-ldap/ruby-net-ldap

jwedoff · Oct 23, 2024 · 1095f26 · 1095f26
2 parents 93f6d72 + 7f060e1
commit 1095f26
Show file tree

Hide file tree

Showing 16 changed files with 583 additions and 245 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -19,12 +19,14 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - "2.5"
           - "2.6"
           - "2.7"
           - "3.0"
-          - "jruby-9.2"
-          - "truffleruby-21.0.0"
+          - "3.1"
+          - "3.2"
+          - "jruby-9.3"
+          - "jruby-9.4"
+          - "truffleruby-22"
     steps:
     - uses: actions/checkout@v2
     - name: Run tests with Ruby ${{ matrix.ruby }}

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -13,7 +13,7 @@ Lint/AssignmentInCondition:
 Style/ParallelAssignment:
   Enabled: false
 
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
   EnforcedStyleForMultiline: comma
 
 Style/TrailingCommaInArguments: