From 49ea2f270d771a01cb9812582d01ee2b031b9b05 Mon Sep 17 00:00:00 2001
From: Dmitry Tsepelev <dmitry.a.tsepelev@gmail.com>
Date: Tue, 29 Aug 2023 10:58:05 +0300
Subject: [PATCH] Fix CI (#155)

---
 .github/workflows/rspec.yml   | 14 +-------------
 .github/workflows/rubocop.yml |  4 ++--
 CHANGELOG.md                  |  3 +++
 gemfiles/rails_6_0.gemfile    |  6 ------
 4 files changed, 6 insertions(+), 21 deletions(-)
 delete mode 100644 gemfiles/rails_6_0.gemfile

diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index 1a7a1b4..fc76db4 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -20,11 +20,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [jruby, 2.6, 2.7, "3.0", 3.1, 3.2]
+        ruby: [jruby, "3.0", 3.1, 3.2]
 
         gemfile: [
           "gemfiles/jruby.gemfile",
-          "gemfiles/rails_6_0.gemfile",
           "gemfiles/rails_6_2.gemfile",
           "gemfiles/rails_7_0.gemfile"
         ]
@@ -33,8 +32,6 @@ jobs:
           - false
 
         exclude:
-          - ruby: jruby
-            gemfile: gemfiles/rails_6_0.gemfile
           - ruby: jruby
             gemfile: gemfiles/rails_6_2.gemfile
           - ruby: jruby
@@ -42,10 +39,6 @@ jobs:
           - ruby: jruby
             gemfile: gemfiles/railsmaster.gemfile
 
-          - ruby: 2.6
-            gemfile: gemfiles/jruby.gemfile
-          - ruby: 2.7
-            gemfile: gemfiles/jruby.gemfile
           - ruby: "3.0"
             gemfile: gemfiles/jruby.gemfile
           - ruby: 3.1
@@ -53,11 +46,6 @@ jobs:
           - ruby: 3.2
             gemfile: gemfiles/jruby.gemfile
 
-          - ruby: 2.6
-            gemfile: gemfiles/rails_7_0.gemfile
-          - ruby: 2.6
-            gemfile: gemfiles/railsmaster.gemfile
-
         include:
           - ruby: ruby-head
             gemfile: gemfiles/railsmaster.gemfile
diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml
index 780850c..d3c2783 100644
--- a/.github/workflows/rubocop.yml
+++ b/.github/workflows/rubocop.yml
@@ -17,5 +17,5 @@ jobs:
         ruby-version: 2.7
     - name: Lint Ruby code with RuboCop
       run: |
-        bundle install --gemfile gemfiles/rails_6_0.gemfile --jobs 4 --retry 3
-        bundle exec --gemfile gemfiles/rails_6_0.gemfile rubocop
+        bundle install --gemfile gemfiles/rails_7_0.gemfile --jobs 4 --retry 3
+        bundle exec --gemfile gemfiles/rails_7_0.gemfile rubocop
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d27e696..bc33ea2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@
 
 ## master
 
+- [PR #154](https://github.com/DmitryTsepelev/store_model/pull/154) Fix serialization on nested objects ([@mweitzel])
+
 ## 2.1.0 (2023-06-31)
 
 - [PR #152](https://github.com/DmitryTsepelev/store_model/pull/152) Use accepts_nested_attributes_for with StoreModel::NestedAttributes   ([@morgangrubb])
@@ -190,3 +192,4 @@
 [@penguoir]: https://github.com/penguoir
 [@RudskikhIvan]: https://github.com/RudskikhIvan
 [@morgangrubb]: https://github.com/morgangrubb
+[@mweitzel]: https://github.com/mweitzel
diff --git a/gemfiles/rails_6_0.gemfile b/gemfiles/rails_6_0.gemfile
deleted file mode 100644
index f0f4ba3..0000000
--- a/gemfiles/rails_6_0.gemfile
+++ /dev/null
@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-gem "sqlite3", "~> 1.4.0"
-gem "activerecord", "~> 6.0.0"
-
-gemspec path: "../"