Skip to content

Commit

Permalink
Merge pull request #391 from brainspec/prepare-release
Browse files Browse the repository at this point in the history
Prepare for release
  • Loading branch information
nashby authored Dec 24, 2021
2 parents 3850be1 + bf927d3 commit 9dd68ca
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 7 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,12 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby-version: ['2.5', '2.6', '2.7', '3.0.2']
ruby-version: ['2.6', '2.7', '3.0.2']
gemfile:
- Gemfile
- Gemfile.rails60
- Gemfile.rails61
- Gemfile.rails70
- Gemfile.railsmaster
- Gemfile.mongo_mapper
db:
Expand All @@ -50,8 +51,8 @@ jobs:
gemfile: Gemfile
- ruby-version: '3.0.2'
gemfile: Gemfile.mongo_mapper
- ruby-version: '2.5'
gemfile: Gemfile.railsmaster
- ruby-version: '2.6'
gemfile: Gemfile.rails70
- ruby-version: '2.6'
gemfile: Gemfile.railsmaster
env:
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## master
## 2.5.0 (December 24, 2021)

### enhancements

Expand Down
9 changes: 9 additions & 0 deletions Gemfile.rails70
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
eval_gemfile('Gemfile.global')

gem 'minitest', '~> 5.8'
gem 'rails', github: 'rails/rails', branch: '7-0-stable', require: false

# TODO: Mongoid doesn't support Rails 7 yet. Uncomment when it's fixed https://jira.mongodb.org/browse/MONGOID-5193
# gem 'mongoid', github: 'mongodb/mongoid'

gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Or install it yourself as:

## Supported Versions

- Ruby 2.5+
- Ruby 2.6+
- Rails 5.2+

## Usage
Expand Down
2 changes: 1 addition & 1 deletion lib/enumerize/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module Enumerize
VERSION = '2.4.0'
VERSION = '2.5.0'
end
8 changes: 7 additions & 1 deletion test/activerecord_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,18 @@
'schema_search_path' => 'public'
}
}

case db
when :postgresql
ActiveRecord::Base.establish_connection(:postgresql_master)
ActiveRecord::Base.connection.recreate_database('enumerize_test')
when :mysql2
ActiveRecord::Tasks::DatabaseTasks.create ActiveRecord::Base.configurations[db.to_s]
if ActiveRecord::Base.configurations.respond_to?(:[])
ActiveRecord::Tasks::DatabaseTasks.create ActiveRecord::Base.configurations[db.to_s]
else
ActiveRecord::Tasks::DatabaseTasks.create ActiveRecord::Base.configurations.find_db_config(db.to_s)
end

ActiveRecord::Base.establish_connection(db)
else
ActiveRecord::Base.establish_connection(db)
Expand Down

0 comments on commit 9dd68ca

Please sign in to comment.