Skip to content

Commit

Permalink
Merge pull request #32 from joinhandshake/ruby-3-1
Browse files Browse the repository at this point in the history
Fix for ruby 3.1.4 support
  • Loading branch information
davkutalek authored Aug 13, 2024
2 parents 3c07624 + d5d2dc0 commit fedbfca
Show file tree
Hide file tree
Showing 7 changed files with 80 additions and 21 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on: push
jobs:
test:

runs-on: ubuntu-20.04
runs-on: ubuntu-latest

strategy:
matrix:
Expand All @@ -19,5 +19,7 @@ jobs:
with:
ruby-version: ${{ matrix.ruby-version }}
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
cache-version: 2

- name: Run tests
run: bundle exec rake spec
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
/.bundle/
/.yardoc
/Gemfile.lock
/_yardoc/
/coverage/
/doc/
/pkg/
/spec/reports/
/tmp/
/spec/tmp
/spec/tmp
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.8
3.1.4
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
## Unreleased

## 1.4.0

Update to be Rails 6.1 compatible

## 1.1.1

- Drop Ruby 2.3 support
Expand All @@ -11,4 +15,4 @@
- Allow for not checking `inside_transaction?` on primary database (https://github.com/joinhandshake/knockoff/pull/13)
- Allow setting `Knockoff.default_target` to set the default target other than `:primary` (https://github.com/joinhandshake/knockoff/pull/11)
- Drop Ruby 2.2 support
- Add Ruby 2.5 support
- Add Ruby 2.5 support
67 changes: 67 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
PATH
remote: .
specs:
knockoff (1.4.0)
activerecord (>= 6, < 7)
activesupport (>= 6, < 7)

GEM
remote: https://rubygems.org/
specs:
activemodel (6.1.7.8)
activesupport (= 6.1.7.8)
activerecord (6.1.7.8)
activemodel (= 6.1.7.8)
activesupport (= 6.1.7.8)
activesupport (6.1.7.8)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
concurrent-ruby (1.3.4)
diff-lcs (1.5.1)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
minitest (5.24.1)
rake (10.5.0)
rspec (3.13.0)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
rspec-mocks (~> 3.13.0)
rspec-core (3.13.0)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-mocks (3.13.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-support (3.13.1)
sqlite3 (1.5.4-aarch64-linux)
sqlite3 (1.5.4-arm-linux)
sqlite3 (1.5.4-arm64-darwin)
sqlite3 (1.5.4-x86-linux)
sqlite3 (1.5.4-x86_64-darwin)
sqlite3 (1.5.4-x86_64-linux)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
zeitwerk (2.6.17)

PLATFORMS
aarch64-linux
arm-linux
arm64-darwin
x86-linux
x86_64-darwin
x86_64-linux

DEPENDENCIES
bundler
knockoff!
rake (~> 10.0)
rspec
sqlite3 (~> 1.5.0)

BUNDLED WITH
2.4.22
13 changes: 0 additions & 13 deletions ci/install_modern_sqlite.sh

This file was deleted.

6 changes: 3 additions & 3 deletions knockoff.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ Gem::Specification.new do |spec|
spec.homepage = "https://github.com/sgringwe/knockoff"
spec.license = "MIT"

spec.platform = Gem::Platform::RUBY
spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
spec.bindir = "exe"
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
spec.bindir = "bin"
spec.require_paths = ["lib"]

spec.add_runtime_dependency 'activerecord', '>= 6', '< 7'
Expand All @@ -24,5 +24,5 @@ Gem::Specification.new do |spec|
spec.add_development_dependency "bundler"
spec.add_development_dependency "rake", "~> 10.0"
spec.add_development_dependency "rspec"
spec.add_development_dependency 'sqlite3'
spec.add_development_dependency 'sqlite3', "~> 1.5.0"
end

0 comments on commit fedbfca

Please sign in to comment.