Skip to content

Commit

Permalink
Change gemfiles to AR 7.1+
Browse files Browse the repository at this point in the history
  • Loading branch information
mirakui committed Sep 1, 2024
1 parent 65424e6 commit 50def5f
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 25 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/integration_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,8 @@ jobs:
strategy:
matrix:
gemfile:
- ar_6.1
- ar_7.0
- ar_7.1
- ar_7.2
steps:
- uses: actions/checkout@v4
- name: Start DB
Expand All @@ -54,9 +53,8 @@ jobs:
strategy:
matrix:
gemfile:
- ar_6.1
- ar_7.0
- ar_7.1
- ar_7.2
steps:
- uses: actions/checkout@v4
- name: Start DB
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
ruby-version: ['2.7', '3.0', '3.1', '3.2', '3.3']
gemfile: ['ar_6.1', 'ar_7.0', 'ar_7.1']
ruby-version: ['3.2', '3.3']
gemfile: ['ar_7.1', 'ar_7.2']

steps:
- uses: actions/checkout@v2
Expand All @@ -35,4 +35,3 @@ jobs:
run: bundle install && bundle exec rake spec
env:
BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile

1 change: 1 addition & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ AllCops:
SuggestExtensions: false
Exclude:
- '**/tmp/**/*'
- '**/*.gemfile'

# Prefer &&/|| over and/or.
Style/AndOr:
Expand Down
12 changes: 4 additions & 8 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
appraise 'ar-6.1' do
gem 'activerecord', '~> 6.1.0'
end

appraise 'ar-7.0' do
gem 'activerecord', '~> 7.0.0'
end

appraise 'ar-7.1' do
gem 'activerecord', '~> 7.1.0'
end

appraise 'ar-7.2' do
gem 'activerecord', '~> 7.2.0'
end
10 changes: 7 additions & 3 deletions gemfiles/ar_7.1.gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
# This file was generated by Appraisal

source 'https://rubygems.org'
source "https://rubygems.org"

gem 'activerecord', '~> 7.1.0'
gem "rspec"
gem "appraisal"
gem "rubocop"
gem "rubocop-md"
gem "activerecord", "~> 7.1.0"

gemspec path: '../'
gemspec path: "../"
11 changes: 11 additions & 0 deletions gemfiles/ar_7.2.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "rspec"
gem "appraisal"
gem "rubocop"
gem "rubocop-md"
gem "activerecord", "~> 7.2.0"

gemspec path: "../"
14 changes: 7 additions & 7 deletions integration_test/gemfiles/ar_7.1.gemfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# This file was generated by Appraisal

source 'https://rubygems.org'
source "https://rubygems.org"

gem 'arproxy', path: '../..'
gem 'rspec'
gem 'appraisal'
gem 'mysql2'
gem 'pg'
gem 'activerecord', '~> 7.1.0'
gem "arproxy", path: "../.."
gem "rspec"
gem "appraisal"
gem "mysql2"
gem "pg"
gem "activerecord", "~> 7.1.0"
10 changes: 10 additions & 0 deletions integration_test/gemfiles/ar_7.2.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "arproxy", path: "../.."
gem "rspec"
gem "appraisal"
gem "mysql2"
gem "pg"
gem "activerecord", "~> 7.2.0"

0 comments on commit 50def5f

Please sign in to comment.