From 88dc3b1e0abf2b37bcfdb3f66894dc7588444563 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stas=20SU=C8=98COV?= <stas@nerd.ro>
Date: Sun, 23 Jun 2024 13:19:57 +0100
Subject: [PATCH] Cleanup CI config.

---
 .github/workflows/ci.yml | 13 +++++++------
 jsonapi.rb.gemspec       |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d9e837c..9d52a7a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,14 +5,16 @@ on: [push, pull_request]
 jobs:
   ruby_rails_test_matrix:
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
 
     strategy:
       matrix:
-        ruby: ['3.0', '3.1', '3.2', '3.3']
-        rails: ['6.1', '7.0', '7.1']
-        exclude:
-          - ruby: 3.2
-            rails: 6
+        ruby: ['3.1', '3.2', '3.3']
+        rails: ['6.1', '7.0.1']
+        experimental: [false]
+        include:
+          - rails: '7.1'
+            experimental: true
 
     steps:
     - uses: actions/checkout@v4
@@ -29,6 +31,5 @@ jobs:
         rm -rf Gemfile.lock
         sudo apt-get update
         sudo apt-get install libsqlite3-dev
-        echo $RAILS_VERSION | grep -q '5' && export SQLITE3_VERSION='~> 1.3.6'
         bundle
         bundle exec rake
diff --git a/jsonapi.rb.gemspec b/jsonapi.rb.gemspec
index eec2dad..c112540 100644
--- a/jsonapi.rb.gemspec
+++ b/jsonapi.rb.gemspec
@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'ransack'
   spec.add_development_dependency 'railties', ENV['RAILS_VERSION']
   spec.add_development_dependency 'activerecord', ENV['RAILS_VERSION']
-  spec.add_development_dependency 'sqlite3', ENV['SQLITE3_VERSION']
+  spec.add_development_dependency 'sqlite3', '~> 1.7'
   spec.add_development_dependency 'ffaker'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec-rails'