Release 2.6.2 + Redo Github Actions matrix using includes (#537)

* test-out-experimental-with-non-existing-ruby-3.2

* redo build matrix with includes

* shorten the matrix with standard builds

* only jruby 9.4 for rails 7

* remove experimental stuff

* bump version. changelog, comment out jruby

* remove dup

Author: mathieujobin

.github/workflows/build.yml

@@ -15,40 +15,30 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby:
-          - 3.1
-          - '3.0'
-          - 2.7
-          - 2.6
-          - 2.5
-          # - jruby-9.2.19.0
-          # - jruby-9.3.1.0
-        rails:
-          - '~> 5.1.0'
-          - '~> 5.2.0'
-          - '~> 6.0.0'
-          - '~> 6.1.0'
-          - '~> 7.0.0'
-          - 'edge'
-        exclude:
-        # Rails edge is now 7.x and requires ruby 2.7
-        - rails: 'edge'
-          ruby: 2.6
-        - rails: 'edge'
-          ruby: 2.5
-        - rails: '~> 7.0.0'
-          ruby: 2.6
-        - rails: '~> 7.0.0'
-          ruby: 2.5
-        # Legacy Rails with newer rubies
-        - rails: '~> 5.1.0'
-          ruby: '3.0'
-        - rails: '~> 5.2.0'
-          ruby: '3.0'
-        - rails: '~> 5.1.0'
-          ruby: 3.1
-        - rails: '~> 5.2.0'
-          ruby: 3.1
+        rails: ["~> 7.0.0", "~> 6.1.0", "~> 6.0.0"]
+        ruby: ["3.2.2", "3.1.4", "3.0.6", "2.7.8"]
+        include:
+          - ruby: 3.2
+            rails: 'edge'
+          # single test failure with jruby
+          #- ruby: jruby-9.4
+          #  rails: '~> 7.0.0'
+          - ruby: 2.6
+            rails: '~> 6.1.0'
+          - ruby: 2.6
+            rails: '~> 6.0.0'
+          - ruby: 2.6
+            rails: '~> 5.2.0'
+          - ruby: 2.6
+            rails: '~> 5.1.0'
+          - ruby: 2.5
+            rails: '~> 6.0.0'
+          - ruby: 2.5
+            rails: '~> 5.2.0'
+          - ruby: 2.5
+            rails: '~> 5.1.0'
+        #os: ubuntu-latest
+        #arch: x64
 
     env:
       RAILS: ${{ matrix.rails }}

CHANGELOG.md

@@ -1,5 +1,10 @@
 # paranoia Changelog
 
+## 2.6.2
+
+* [#441](https://github.com/rubysherpas/paranoia/pull/441) Recursive restore with has_many/one through assocs (#441) 
+  [Emil Ong](https://github.com/emilong)
+
 ## 2.6.1
 
 * [#535](https://github.com/rubysherpas/paranoia/pull/535) Allow to skip updating paranoia_destroy_attributes for records while really_destroy!

lib/paranoia/version.rb

@@ -1,3 +1,3 @@
 module Paranoia
-  VERSION = '2.6.1'.freeze
+  VERSION = '2.6.2'.freeze
 end