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

Add support for activerecord 5.1 and 5.2 #28

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
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
13 changes: 2 additions & 11 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,21 @@ version: 2
references:

ruby_image: &ruby_image
circleci/ruby:2.3.3
cimg/ruby:2.7.7

mysql_container_config: &mysql_container_config
docker:
- image: *ruby_image
environment:
DB_HOST=127.0.0.1
- image: circleci/mysql:5.6.39
- image: cimg/mysql:5.7.36
environment:
MYSQL_DATABASE=immortal_db

sqlite_container_config: &sqlite_container_config
docker:
- image: *ruby_image

install_bundler: &install_bundler
run:
name: Install Bundler
command: |
gem install bundler
gem cleanup bundler

install_gems: &install_gems
run:
name: Install Gems
Expand All @@ -48,15 +41,13 @@ jobs:
- DB_PORT=3306
steps:
- checkout
- *install_bundler
- *install_gems
- *appraisal_install
- *appraisal_rspec
test_on_sqlite:
<<: *sqlite_container_config
steps:
- checkout
- *install_bundler
- *install_gems
- *appraisal_install
- *appraisal_rspec
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.3.3
2.7.7
18 changes: 9 additions & 9 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
appraise 'activerecord-41' do
gem 'activerecord', '~> 4.1.0'
gem 'mysql2', '0.3.20' if ENV['CONFIG_MYSQL']
appraise 'activerecord-50' do
gem 'activerecord', '~> 5.0.0'
gem 'mysql2' if ENV['CONFIG_MYSQL']
end

appraise 'activerecord-42' do
gem 'activerecord', '~> 4.2.0'
gem 'mysql2', '~> 0.4.0' if ENV['CONFIG_MYSQL']
appraise 'activerecord-51' do
gem 'activerecord', '~> 5.1.0'
gem 'mysql2' if ENV['CONFIG_MYSQL']
end

appraise 'activerecord-50' do
gem 'activerecord', '~> 5.0.0'
gem 'mysql2', '~> 0.5.0' if ENV['CONFIG_MYSQL']
appraise 'activerecord-52' do
gem 'activerecord', '~> 5.2.0'
gem 'mysql2' if ENV['CONFIG_MYSQL']
end
120 changes: 0 additions & 120 deletions gemfiles/activerecord_41.gemfile.lock

This file was deleted.

118 changes: 0 additions & 118 deletions gemfiles/activerecord_42.gemfile.lock

This file was deleted.

2 changes: 1 addition & 1 deletion gemfiles/activerecord_50.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
source "http://rubygems.org"

gem "activerecord", "~> 5.0.0"
gem "mysql2", "~> 0.5.0"
gem "mysql2"

gemspec path: "../"
Loading