Skip to content

Commit

Permalink
Merge branch 'master' into departure-trilogy
Browse files Browse the repository at this point in the history
  • Loading branch information
xjunior committed Jul 23, 2024
2 parents 2a965f3 + 9bff269 commit 443922a
Show file tree
Hide file tree
Showing 15 changed files with 96 additions and 1,448 deletions.
13 changes: 2 additions & 11 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,6 @@ jobs:
- gemfiles/rails_6_1.gemfile
- gemfiles/rails_7_0.gemfile
- gemfiles/rails_7_1.gemfile
include:
- ruby: 2.7
gemfile: gemfiles/ruby_2.7_rails_6_0.gemfile
- ruby: 2.7
gemfile: gemfiles/ruby_2.7_rails_6_1.gemfile
- ruby: 2.7
gemfile: gemfiles/ruby_2.7_rails_7_0.gemfile
- ruby: 2.7
gemfile: gemfiles/ruby_2.7_rails_7_1.gemfile
env:
PERCONA_DB_USER: root
PERCONA_DB_PASSWORD: root
Expand Down Expand Up @@ -56,12 +47,12 @@ jobs:
env:
PERCONA_DB_USER: root
PERCONA_DB_PASSWORD: root
BUNDLE_GEMFILE: gemfiles/ruby_2.7_rails_6_0.gemfile
BUNDLE_GEMFILE: gemfiles/rails_6_1.gemfile
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: 3.0
bundler-cache: true
- run: bundle exec rubocop --parallel
28 changes: 0 additions & 28 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
appraise 'rails-6-0' do
gem 'rails', '6.0.6.1'
gem 'activerecord-trilogy-adapter', '>= 3.1.2'
end

appraise 'rails-6-1' do
gem 'rails', '6.1.7.6'
gem 'activerecord-trilogy-adapter', '>= 3.1.2'
Expand All @@ -16,26 +11,3 @@ end
appraise 'rails-7-1' do
gem 'rails', '7.1.3'
end

appraise 'ruby-2.7-rails-6-0' do
gem 'activerecord-trilogy-adapter', '>= 3.1.2'
gem 'nokogiri', '< 1.16'
gem 'rails', '6.0.6.1'
end

appraise 'ruby-2.7-rails-6-1' do
gem 'activerecord-trilogy-adapter', '>= 3.1.2'
gem 'nokogiri', '< 1.16'
gem 'rails', '6.1.7.6'
end

appraise 'ruby-2.7-rails-7-0' do
gem 'activerecord-trilogy-adapter', '>= 3.1.2'
gem 'nokogiri', '< 1.16'
gem 'rails', '7.0.8'
end

appraise 'ruby-2.7-rails-7-1' do
gem 'rails', '7.1.3'
gem 'nokogiri', '< 1.16'
end
11 changes: 0 additions & 11 deletions gemfiles/rails_6_0.gemfile

This file was deleted.

244 changes: 0 additions & 244 deletions gemfiles/rails_6_0.gemfile.lock

This file was deleted.

Loading

0 comments on commit 443922a

Please sign in to comment.