Merge pull request #71 from k2nr/bquorning/fix-ci

Fix CI
k2nr · Mar 9, 2024 · 94d1e33 · 94d1e33
2 parents 2a8a06a + c963e2e
commit 94d1e33
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 # ULID::Rails
 
+[![CI tests status](https://github.com/k2nr/ulid-rails/actions/workflows/test.yml/badge.svg?branch%3Amaster)](https://github.com/k2nr/ulid-rails/actions/workflows/test.yml?query=branch%3Amaster) [![CI linting status](https://github.com/k2nr/ulid-rails/actions/workflows/lint.yml/badge.svg?branch%3Amaster)](https://github.com/k2nr/ulid-rails/actions/workflows/lint.yml?query=branch%3Amaster)
+
 This gem makes it possible to use [ULID](https://github.com/ulid/spec) for DB in a Ruby on Rails app.
 
 ## Installation

diff --git a/gemfiles/5.2.gemfile b/gemfiles/5.2.gemfile
@@ -5,6 +5,6 @@ gemspec path: ".."
 gem "activesupport", "~> 5.2.0"
 gem "activemodel", "~> 5.2.0"
 gem "activerecord", "~> 5.2.0"
-gem "sqlite3", "~> 1.3", ">= 1.3.6"
+gem "sqlite3", "~> 1.3", ">= 1.3.6", ("< 1.7" if RUBY_VERSION < "3")
 gem "mysql2", ">= 0.4.4", "< 0.6.0"
 gem "pg", ">= 0.18", "< 2.0"
diff --git a/gemfiles/6.0.gemfile b/gemfiles/6.0.gemfile
@@ -5,7 +5,7 @@ gemspec path: ".."
 gem "activesupport", "~> 6.0.0"
 gem "activemodel", "~> 6.0.0"
 gem "activerecord", "~> 6.0.0"
-gem "sqlite3", "~> 1.4"
+gem "sqlite3", "~> 1.4", ("< 1.7" if RUBY_VERSION < "3")
 gem "mysql2", ">= 0.4.4"
 gem "pg", ">= 0.18", "< 2.0"
 gem "activerecord-trilogy-adapter"
diff --git a/gemfiles/6.1.gemfile b/gemfiles/6.1.gemfile
@@ -5,7 +5,7 @@ gemspec path: ".."
 gem "activesupport", "~> 6.1.0"
 gem "activemodel", "~> 6.1.0"
 gem "activerecord", "~> 6.1.0"
-gem "sqlite3", "~> 1.4"
+gem "sqlite3", "~> 1.4", ("< 1.7" if RUBY_VERSION < "3")
 gem "mysql2", "~> 0.5"
 gem "pg", "~> 1.1"
 gem "activerecord-trilogy-adapter"
diff --git a/gemfiles/7.0.5.gemfile b/gemfiles/7.0.5.gemfile
@@ -5,7 +5,7 @@ gemspec path: ".."
 gem "activesupport", "~> 7.0.5"
 gem "activemodel", "~> 7.0.5"
 gem "activerecord", "~> 7.0.5"
-gem "sqlite3", "~> 1.4"
+gem "sqlite3", "~> 1.4", ("< 1.7" if RUBY_VERSION < "3")
 gem "mysql2", "~> 0.5"
 gem "pg", "~> 1.1"
 gem "activerecord-trilogy-adapter"
diff --git a/gemfiles/7.0.gemfile b/gemfiles/7.0.gemfile
@@ -5,7 +5,7 @@ gemspec path: ".."
 gem "activesupport", "~> 7.0.0", "< 7.0.5"
 gem "activemodel", "~> 7.0.0", "< 7.0.5"
 gem "activerecord", "~> 7.0.0", "< 7.0.5"
-gem "sqlite3", "~> 1.4"
+gem "sqlite3", "~> 1.4", ("< 1.7" if RUBY_VERSION < "3")
 gem "mysql2", "~> 0.5"
 gem "pg", "~> 1.1"
 gem "activerecord-trilogy-adapter"
diff --git a/gemfiles/7.1.gemfile b/gemfiles/7.1.gemfile
@@ -5,7 +5,7 @@ gemspec path: ".."
 gem "activesupport", "~> 7.1.0"
 gem "activemodel", "~> 7.1.0"
 gem "activerecord", "~> 7.1.0"
-gem "sqlite3", "~> 1.4"
+gem "sqlite3", "~> 1.4", ("< 1.7" if RUBY_VERSION < "3")
 gem "mysql2", "~> 0.5"
 gem "pg", "~> 1.1"
 gem "trilogy", "~> 2.4"
diff --git a/test/ulid/rails_test.rb b/test/ulid/rails_test.rb
@@ -91,7 +91,7 @@ def test_deserializes_the_value_back_to_an_ulid
   def test_auto_generate_primary_key
     user = User.create!
 
-    assert user.id.is_a? String
+    assert_kind_of String, user.id
     assert_equal 26, user.id.length
 
     id = user.id

diff --git a/ulid-rails.gemspec b/ulid-rails.gemspec
@@ -46,6 +46,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "rubocop-minitest"
-  spec.add_development_dependency "standard", "~> 1.32.0"
+  spec.add_development_dependency "rubocop-minitest", "0.34.5"
+  spec.add_development_dependency "standard", "~> 1.34.0"
 end