Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add rails 7.2 and 8.0 support #14

Merged
merged 1 commit into from
Jan 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 25 additions & 3 deletions .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
bundler-cache: true
- name: Run linter
run: bundle exec rubocop
ruby-2:
ruby-2-7:
runs-on: ubuntu-latest
strategy:
fail-fast: false
Expand All @@ -42,7 +42,7 @@ jobs:
bundler-cache: true
- name: Run tests
run: bundle exec rspec
ruby-3:
ruby-3-0:
runs-on: ubuntu-latest
strategy:
fail-fast: false
Expand All @@ -51,7 +51,6 @@ jobs:
- "3.0"
- "3.1"
- "3.2"
- "3.3"
gemfile:
- ci/Gemfile.rails-6.0
- ci/Gemfile.rails-6.1
Expand All @@ -68,3 +67,26 @@ jobs:
bundler-cache: true
- name: Run tests
run: bundle exec rspec
ruby-3-2:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
ruby:
- "3.2"
- "3.3"
- "3.4"
gemfile:
- ci/Gemfile.rails-7.2
- ci/Gemfile.rails-8.0
name: "ruby-${{ matrix.ruby }}/${{ matrix.gemfile }} specs"
env:
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
steps:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
- name: Run tests
run: bundle exec rspec
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## 0.3.9 - 2025-01-21
* Move hooks to a separate gem, [esse-hooks](https://github.com/marcosgz/esse-hooks)
* Add rails 8 support

## 0.3.8 - 2024-08-08
* Add `connect_with:` option to the collection definition.
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
gem 'esse', '~> 0.3.4'
gem 'sqlite3', '~> 1.7.3'
gem 'activerecord', '~> 5.2'
gem 'esse-rspec', '~> 0.0.6'
gem 'esse-rspec'
gem 'elasticsearch', '~> 7.17', '>= 7.17.10'

# Specify your gem's dependencies in esse-active_record.gemspec
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: .
specs:
esse-active_record (0.3.9)
activerecord (>= 4.2, < 8)
activerecord (>= 4.2)
esse (>= 0.3.0)
esse-hooks

Expand Down Expand Up @@ -147,7 +147,7 @@ DEPENDENCIES
elasticsearch (~> 7.17, >= 7.17.10)
esse (~> 0.3.4)
esse-active_record!
esse-rspec (~> 0.0.6)
esse-rspec
pry
rake
rspec
Expand Down
10 changes: 8 additions & 2 deletions bin/setup
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,11 @@ set -euo pipefail
IFS=$'\n\t'
set -vx

bundle install
find ci -type f \( -iname "Gemfile.*" ! -iname "*.lock" \) -exec bundle install --gemfile {} \;
mise exec [email protected] -- bundle install
mise exec [email protected] -- bundle install --gemfile ci/Gemfile.rails-7.1
mise exec [email protected] -- bundle install --gemfile ci/Gemfile.rails-7.0
mise exec [email protected] -- bundle install --gemfile ci/Gemfile.rails-6.0
mise exec [email protected] -- bundle install --gemfile ci/Gemfile.rails-6.1
mise exec [email protected] -- bundle install --gemfile ci/Gemfile.rails-5.2
mise exec [email protected] -- bundle install --gemfile ci/Gemfile.rails-8.0
mise exec [email protected] -- bundle install --gemfile ci/Gemfile.rails-7.2
2 changes: 1 addition & 1 deletion ci/Gemfile.rails-5.2
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source "https://rubygems.org"

gem 'sqlite3', '~> 1.3.6'
gem 'activerecord', '~> 5.2'
gem 'esse-rspec', '~> 0.0.6'
gem 'esse-rspec'
gem 'elasticsearch', '~> 7.17', '>= 7.17.10'

gemspec path: ".."
4 changes: 2 additions & 2 deletions ci/Gemfile.rails-5.2.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: ..
specs:
esse-active_record (0.3.9)
activerecord (>= 4.2, < 8)
activerecord (>= 4.2)
esse (>= 0.3.0)
esse-hooks

Expand Down Expand Up @@ -146,7 +146,7 @@ DEPENDENCIES
dotenv
elasticsearch (~> 7.17, >= 7.17.10)
esse-active_record!
esse-rspec (~> 0.0.6)
esse-rspec
pry
rake
rspec
Expand Down
2 changes: 1 addition & 1 deletion ci/Gemfile.rails-6.0
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source "https://rubygems.org"

gem 'sqlite3'
gem 'activerecord', '~> 6.0'
gem 'esse-rspec', '~> 0.0.6'
gem 'esse-rspec'
gem 'elasticsearch', '~> 7.17', '>= 7.17.10'

gemspec path: ".."
4 changes: 2 additions & 2 deletions ci/Gemfile.rails-6.0.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: ..
specs:
esse-active_record (0.3.9)
activerecord (>= 4.2, < 8)
activerecord (>= 4.2)
esse (>= 0.3.0)
esse-hooks

Expand Down Expand Up @@ -147,7 +147,7 @@ DEPENDENCIES
dotenv
elasticsearch (~> 7.17, >= 7.17.10)
esse-active_record!
esse-rspec (~> 0.0.6)
esse-rspec
pry
rake
rspec
Expand Down
2 changes: 1 addition & 1 deletion ci/Gemfile.rails-6.1
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source "https://rubygems.org"

gem 'sqlite3'
gem 'activerecord', '~> 6.1'
gem 'esse-rspec', '~> 0.0.6'
gem 'esse-rspec'
gem 'elasticsearch', '~> 7.17', '>= 7.17.10'

gemspec path: ".."
4 changes: 2 additions & 2 deletions ci/Gemfile.rails-6.1.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: ..
specs:
esse-active_record (0.3.9)
activerecord (>= 4.2, < 8)
activerecord (>= 4.2)
esse (>= 0.3.0)
esse-hooks

Expand Down Expand Up @@ -147,7 +147,7 @@ DEPENDENCIES
dotenv
elasticsearch (~> 7.17, >= 7.17.10)
esse-active_record!
esse-rspec (~> 0.0.6)
esse-rspec
pry
rake
rspec
Expand Down
2 changes: 1 addition & 1 deletion ci/Gemfile.rails-7.0
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source "https://rubygems.org"

gem 'sqlite3'
gem 'activerecord', '~> 6.0'
gem 'esse-rspec', '~> 0.0.6'
gem 'esse-rspec'
gem 'elasticsearch', '~> 7.17', '>= 7.17.10'

gemspec path: ".."
4 changes: 2 additions & 2 deletions ci/Gemfile.rails-7.0.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: ..
specs:
esse-active_record (0.3.9)
activerecord (>= 4.2, < 8)
activerecord (>= 4.2)
esse (>= 0.3.0)
esse-hooks

Expand Down Expand Up @@ -147,7 +147,7 @@ DEPENDENCIES
dotenv
elasticsearch (~> 7.17, >= 7.17.10)
esse-active_record!
esse-rspec (~> 0.0.6)
esse-rspec
pry
rake
rspec
Expand Down
2 changes: 1 addition & 1 deletion ci/Gemfile.rails-7.1
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source "https://rubygems.org"

gem 'sqlite3'
gem 'activerecord', '~> 7.1'
gem 'esse-rspec', '~> 0.0.6'
gem 'esse-rspec'
gem 'elasticsearch', '~> 7.17', '>= 7.17.10'

gemspec path: ".."
4 changes: 2 additions & 2 deletions ci/Gemfile.rails-7.1.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: ..
specs:
esse-active_record (0.3.9)
activerecord (>= 4.2, < 8)
activerecord (>= 4.2)
esse (>= 0.3.0)
esse-hooks

Expand Down Expand Up @@ -155,7 +155,7 @@ DEPENDENCIES
dotenv
elasticsearch (~> 7.17, >= 7.17.10)
esse-active_record!
esse-rspec (~> 0.0.6)
esse-rspec
pry
rake
rspec
Expand Down
10 changes: 10 additions & 0 deletions ci/Gemfile.rails-7.2
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# frozen_string_literal: true

source "https://rubygems.org"

gem 'sqlite3'
gem 'activerecord', '~> 7.2'
gem 'esse-rspec'
gem 'elasticsearch', '~> 7.17', '>= 7.17.10'

gemspec path: ".."
Loading
Loading