Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 738aa01

Browse files
authoredFeb 25, 2025··
Support Rails 8 (#5)
* add tests for rails 8 * fix filename * shift ruby versions test, drop rails 7.1 (we got 7.2) * run rubocop against fixed ruby version * drop simple cov, it's crap * we can only test Rails 6 with ruby 3.1 * fix rubocop * fix rails 6 with concurrent ruby * rubocop * Update test.yml * 👮 🤖
1 parent 39c4ca2 commit 738aa01

File tree

8 files changed

+18
-28
lines changed

8 files changed

+18
-28
lines changed
 

Diff for: ‎.github/workflows/test.yml

+14-4
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,29 @@ jobs:
1717
matrix:
1818
ruby:
1919
- "3.1"
20+
- "3.2"
2021
- "3.3"
22+
- "3.4"
2123
- "head"
2224
rails:
2325
- "6.1"
24-
- "7.1"
2526
- "7.2"
27+
- "8.0"
2628
exclude:
29+
- ruby: "3.2"
30+
rails: "6.1"
2731
- ruby: "3.3"
2832
rails: "6.1"
33+
- ruby: "3.4"
34+
rails: "6.1"
2935
- ruby: "head"
3036
rails: "6.1"
37+
- ruby: "3.1"
38+
rails: "7.2"
39+
- ruby: "3.1"
40+
rails: "8.0"
3141
steps:
32-
- uses: actions/checkout@v3
42+
- uses: actions/checkout@v4
3343
- name: Set up Ruby
3444
uses: ruby/setup-ruby@v1
3545
with:
@@ -47,11 +57,11 @@ jobs:
4757
strategy:
4858
matrix:
4959
ruby:
50-
- "head"
60+
- "3.4"
5161
rails:
5262
- "7.2"
5363
steps:
54-
- uses: actions/checkout@v3
64+
- uses: actions/checkout@v4
5565
- name: Set up Ruby
5666
uses: ruby/setup-ruby@v1
5767
with:

Diff for: ‎Appraisals

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ SUPPORTED_RAILS_VERSIONS = %w[
44
6.1
55
7.1
66
7.2
7+
8.0
78
].freeze
89

910
SUPPORTED_RAILS_VERSIONS.each do |version|

Diff for: ‎Gemfile

-2
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,3 @@ gem 'minitest', '~> 5.0'
1010
gem 'minitest-reporters', '~> 1.6.0'
1111
gem 'rake', '~> 13.2'
1212
gem 'rubocop', '~> 1.25.1'
13-
gem 'simplecov', '~> 0.22.0', require: false # CodeClimate not compatible with 0.18+ yet - https://github.com/codeclimate/test-reporter/issues/413
14-
gem 'simplecov-lcov', '< 0.9'

Diff for: ‎diffcrypt.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
2929
spec.executables = %w[diffcrypt]
3030
spec.require_paths = ['lib']
3131

32-
spec.add_runtime_dependency 'activesupport', '>= 6.0', '< 7.3'
32+
spec.add_runtime_dependency 'activesupport', '>= 6.0', '< 9.0'
3333
spec.add_runtime_dependency 'thor', '>= 0.20', '< 2'
3434
spec.metadata['rubygems_mfa_required'] = 'true'
3535
end

Diff for: ‎gemfiles/rails_6.1.gemfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55
source 'https://rubygems.org'
66

77
gem 'appraisal'
8+
gem 'concurrent-ruby', '1.3.4' # 1.3.5. breaks with Rails < 7, see https://github.com/ruby-concurrency/concurrent-ruby/commit/d7ce956dacd0b772273d39b8ed31a30cff7ecf38
89
gem 'minitest', '~> 5.0'
910
gem 'minitest-reporters', '~> 1.6.0'
1011
gem 'rails', '~> 6.1'
1112
gem 'rake', '~> 13.2'
1213
gem 'rubocop', '~> 1.25.1'
13-
gem 'simplecov', '~> 0.22.0', require: false
14-
gem 'simplecov-lcov', '< 0.9'
1514

1615
gemspec path: '../'

Diff for: ‎gemfiles/rails_7.2.gemfile

-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,5 @@ gem 'minitest-reporters', '~> 1.6.0'
1010
gem 'rails', '~> 7.2'
1111
gem 'rake', '~> 13.2'
1212
gem 'rubocop', '~> 1.25.1'
13-
gem 'simplecov', '~> 0.22.0', require: false
14-
gem 'simplecov-lcov', '< 0.9'
1513

1614
gemspec path: '../'

Diff for: ‎gemfiles/rails_7.1.gemfile renamed to ‎gemfiles/rails_8.0.gemfile

+1-3
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@ source 'https://rubygems.org'
77
gem 'appraisal'
88
gem 'minitest', '~> 5.0'
99
gem 'minitest-reporters', '~> 1.6.0'
10-
gem 'rails', '~> 7.1'
10+
gem 'rails', '~> 8.0'
1111
gem 'rake', '~> 13.2'
1212
gem 'rubocop', '~> 1.25.1'
13-
gem 'simplecov', '~> 0.22.0', require: false
14-
gem 'simplecov-lcov', '< 0.9'
1513

1614
gemspec path: '../'

Diff for: ‎test/test_helper.rb

-14
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,5 @@
11
# frozen_string_literal: true
22

3-
require 'simplecov'
4-
require 'simplecov-lcov'
5-
SimpleCov::Formatter::LcovFormatter.config.report_with_single_file = true
6-
SimpleCov::Formatter::LcovFormatter.config do |c|
7-
c.single_report_path = 'coverage/lcov.info'
8-
end
9-
SimpleCov.formatters = SimpleCov::Formatter::MultiFormatter.new(
10-
[
11-
SimpleCov::Formatter::HTMLFormatter,
12-
SimpleCov::Formatter::LcovFormatter,
13-
],
14-
)
15-
SimpleCov.start
16-
173
$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
184
require 'diffcrypt'
195

0 commit comments

Comments
 (0)
Please sign in to comment.