Skip to content

Commit

Permalink
Merge pull request #44 from procore-oss/remove-upper-version-limit
Browse files Browse the repository at this point in the history
Add tests for AR 7.2 and remove upper version limit
  • Loading branch information
jhollinger authored Sep 17, 2024
2 parents 3b6d826 + f156161 commit 66743d7
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 4 deletions.
29 changes: 27 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ on:
permissions:
contents: read
jobs:
test:
test-current:
strategy:
matrix:
os: [ubuntu-latest]
ruby: ["3.0", "3.1", "3.2", "3.3"]
ruby: ["3.1", "3.2", "3.3"]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
Expand All @@ -26,3 +26,28 @@ jobs:
bundle exec appraisal install --path=vendor/bundle
- name: Run tests
run: bundle exec appraisal rake test

test-3_0:
strategy:
matrix:
os: [ubuntu-latest]
ruby: ["3.0"]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- name: Set up Ruby ${{ matrix.ruby }}
uses: ruby/setup-ruby@a6e6f86333f0a2523ece813039b8b4be04560854 # v1
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
- name: Installing dependencies
run: |
bundle check --path=vendor/bundle || bundle install --path=vendor/bundle
bundle exec appraisal ar-6.1 bundle install --path=vendor/bundle
bundle exec appraisal ar-7.0 bundle install --path=vendor/bundle
bundle exec appraisal ar-7.1 bundle install --path=vendor/bundle
- name: Run tests
run: |
bundle exec appraisal ar-6.1 rake test
bundle exec appraisal ar-7.0 rake test
bundle exec appraisal ar-7.1 rake test
4 changes: 4 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# frozen_string_literal: true

appraise "ar-7.2" do
gem "activerecord", "~> 7.2.1"
end

appraise "ar-7.1" do
gem "activerecord", "~> 7.1.1"
end
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
### 1.3.0 (2024-09-04)

- Support ActiveRecord 7.2
- Remove restrictions on future ActiveRecord versions

### 1.2.0 (2024-06-26)

- [BUGFIX] Fixes an issue where an association wouldn't be preloaded if it used a dynamic blueprint.
Expand Down
2 changes: 1 addition & 1 deletion blueprinter-activerecord.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
spec.files = Dir['lib/**/*']
spec.require_paths = ['lib']

spec.add_runtime_dependency 'activerecord', ['>= 6.0', '< 7.2']
spec.add_runtime_dependency 'activerecord', ['>= 6.0']
spec.add_runtime_dependency 'blueprinter', '~> 1.0'

spec.add_development_dependency 'appraisal', '~> 2.5'
Expand Down
7 changes: 7 additions & 0 deletions gemfiles/ar_7.2.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "activerecord", "~> 7.2.1"

gemspec path: "../"
2 changes: 1 addition & 1 deletion lib/blueprinter-activerecord/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module BlueprinterActiveRecord
VERSION = "1.2.0"
VERSION = "1.3.0"
end

0 comments on commit 66743d7

Please sign in to comment.