Skip to content

Commit 0cdd582

Browse files
danlaffanjaredbeck
andauthored
Test against Rails 7.0 (#741)
Co-authored-by: Jared Beck <jared@jaredbeck.com>
1 parent 5e0253d commit 0cdd582

4 files changed

Lines changed: 21 additions & 14 deletions

File tree

.github/workflows/test.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
uses: actions/setup-ruby@v1
1515
with:
1616
# Set to `TargetRubyVersion` in `.rubocopy.yml`
17-
ruby-version: 2.4
17+
ruby-version: 2.6
1818
- name: Bundle
1919
run: |
2020
gem install bundler
@@ -56,19 +56,17 @@ jobs:
5656
# have set this up with each database as a separate job, but then we'd be
5757
# duplicating the matrix configuration three times.
5858
matrix:
59-
gemfile: [ 'rails_5.2', 'rails_6.0', 'rails_6.1' ]
59+
gemfile: [ 'rails_5.2', 'rails_6.0', 'rails_6.1', 'rails_7.0' ]
6060

6161
# To keep matrix size down, only test highest and lowest rubies. In
6262
# `.rubocopy.yml`, set `TargetRubyVersion`, to the lowest ruby version
6363
# tested here.
64-
ruby: [ '2.4', '2.7' ]
64+
ruby: [ '2.6', '2.7' ]
6565

6666
exclude:
67-
# rails 6 requires ruby >= 2.5.0
68-
- ruby: '2.4'
69-
gemfile: 'rails_6.0'
70-
- ruby: '2.4'
71-
gemfile: 'rails_6.1'
67+
# rails 7 requires ruby >= 2.7.0
68+
- ruby: '2.6'
69+
gemfile: 'rails_7.0'
7270
steps:
7371
- name: Checkout source
7472
uses: actions/checkout@v2

.rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ AllCops:
1212
# rubies on CI.
1313
#
1414
# Should be same as `ruby-version` in `.github/workflows/test.yml`
15-
TargetRubyVersion: 2.4
15+
TargetRubyVersion: 2.6
1616

1717
# Avoid empty lines in methods, they are a sign the method is too big.
1818
Layout/EmptyLineAfterGuardClause:

authlogic.gemspec

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ require "authlogic/version"
1818
"tieg.zaharia@gmail.com",
1919
"jared@jaredbeck.com"
2020
]
21-
s.homepage = "http://github.com/binarylogic/authlogic"
21+
s.homepage = "https://github.com/binarylogic/authlogic"
2222
s.summary = "An unobtrusive ruby authentication library based on ActiveRecord."
2323
s.license = "MIT"
2424

25-
s.required_ruby_version = ">= 2.4.0"
25+
s.required_ruby_version = ">= 2.6.0"
2626

2727
# See doc/rails_support_in_authlogic_5.0.md
28-
s.add_dependency "activemodel", [">= 5.2", "< 6.2"]
29-
s.add_dependency "activerecord", [">= 5.2", "< 6.2"]
30-
s.add_dependency "activesupport", [">= 5.2", "< 6.2"]
28+
s.add_dependency "activemodel", [">= 5.2", "< 7.1"]
29+
s.add_dependency "activerecord", [">= 5.2", "< 7.1"]
30+
s.add_dependency "activesupport", [">= 5.2", "< 7.1"]
3131
s.add_dependency "request_store", "~> 1.0"
3232
s.add_development_dependency "bcrypt", "~> 3.1"
3333
s.add_development_dependency "byebug", "~> 10.0"

gemfiles/rails_7.0.rb

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# frozen_string_literal: true
2+
3+
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
4+
5+
source "https://rubygems.org"
6+
gemspec path: ".."
7+
8+
gem "activerecord", "~> 7.0.0.alpha", github: "rails/rails", branch: "main"
9+
gem "activesupport", "~> 7.0.0.alpha", github: "rails/rails", branch: "main"

0 commit comments

Comments
 (0)