Cleanup CI config.

stas · Jun 23, 2024 · ac62968 · ac62968
1 parent 5f52cdd
commit ac62968
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,14 +5,17 @@ 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'
+            ruby: ['3.1', '3.2', '3.3']
+            experimental: true
 
     steps:
     - uses: actions/checkout@v4
@@ -29,6 +32,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
@@ -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'