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

Prep for Rails 7 #597

Merged
merged 4 commits into from Sep 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 10 additions & 1 deletion .github/workflows/ci.yml
Expand Up @@ -22,6 +22,11 @@ jobs:
- rails70
db: [POSTGRES, MYSQL, SQLITE]
exclude:
# MySQL has issues on Ruby 2.3
# https://github.com/ruby/setup-ruby/issues/150
- ruby: 2.3
db: MYSQL

# Rails 5.0 supports Ruby 2.2-2.4
- appraisal: rails50
ruby: 2.5
Expand Down Expand Up @@ -62,11 +67,15 @@ jobs:
- appraisal: rails61
ruby: 2.4

# Rails 7 supports Ruby 2.5+
# Rails 7 supports Ruby 2.7+
- appraisal: rails70
ruby: 2.3
- appraisal: rails70
ruby: 2.4
- appraisal: rails70
ruby: 2.5
- appraisal: rails70
ruby: 2.6

services:
postgres:
Expand Down
7 changes: 7 additions & 0 deletions Appraisals
Expand Up @@ -35,3 +35,10 @@ appraise "rails61" do
gem "pg", ">= 1.1", "< 2.0"
gem "sqlite3", "~> 1.4"
end

appraise "rails70" do
gem "rails", ">= 7.0.0.alpha2", "< 7.1"
gem "mysql2", ">= 0.4.4"
gem "pg", ">= 1.1"
gem "sqlite3", ">= 1.4"
end
2 changes: 1 addition & 1 deletion README.md
@@ -1,6 +1,6 @@
Audited
[![Gem Version](https://img.shields.io/gem/v/audited.svg)](http://rubygems.org/gems/audited)
[![Build Status](https://secure.travis-ci.org/collectiveidea/audited.svg)](http://travis-ci.org/collectiveidea/audited)
![Build Status](https://github.com/collectiveidea/audited/actions/workflows/ci.yml/badge.svg)
[![Code Climate](https://codeclimate.com/github/collectiveidea/audited.svg)](https://codeclimate.com/github/collectiveidea/audited)
[![Security](https://hakiri.io/github/collectiveidea/audited/master.svg)](https://hakiri.io/github/collectiveidea/audited/master)
[![Ruby Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://github.com/testdouble/standard)
Expand Down
4 changes: 2 additions & 2 deletions audited.gemspec
Expand Up @@ -16,10 +16,10 @@ Gem::Specification.new do |gem|

gem.required_ruby_version = ">= 2.3.0"

gem.add_dependency "activerecord", ">= 5.0", "< 6.2"
gem.add_dependency "activerecord", ">= 5.0", "< 7.1"

gem.add_development_dependency "appraisal"
gem.add_development_dependency "rails", ">= 5.0", "< 6.2"
gem.add_development_dependency "rails", ">= 5.0", "< 7.1"
gem.add_development_dependency "rspec-rails"
gem.add_development_dependency "standard"
gem.add_development_dependency "single_cov"
Expand Down
10 changes: 10 additions & 0 deletions gemfiles/rails70.gemfile
@@ -0,0 +1,10 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "rails", ">= 7.0.0.alpha2", "< 7.1"
gem "mysql2", ">= 0.4.4"
gem "pg", ">= 1.1"
gem "sqlite3", ">= 1.4"

gemspec name: "audited", path: "../"