Skip to content

Commit 3fc20e8

Browse files
authored
Merge pull request #58 from clio/ruby-3
Updates CI to support Ruby 3+ and Rails v7
2 parents 03d89f9 + ef12e69 commit 3fc20e8

File tree

6 files changed

+27
-10
lines changed

6 files changed

+27
-10
lines changed

.github/workflows/ci.yml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,28 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
gemfile:
17-
- Gemfile.rails-5.0-stable
18-
- Gemfile.rails-5.1-stable
1917
- Gemfile.rails-5.2-stable
2018
- Gemfile.rails-6.0-stable
2119
- Gemfile.rails-6.1-stable
20+
- Gemfile.rails-7.0-stable
21+
ruby-version: ['3.1', '3.0', '2.7']
22+
exclude:
23+
- gemfile: Gemfile.rails-6.0-stable
24+
ruby-version: "3.0"
25+
- gemfile: Gemfile.rails-6.0-stable
26+
ruby-version: "3.1"
27+
- gemfile: Gemfile.rails-5.2-stable
28+
ruby-version: "3.0"
29+
- gemfile: Gemfile.rails-5.2-stable
30+
ruby-version: "3.1"
2231
env:
2332
BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}
2433
steps:
25-
- uses: actions/checkout@v2
26-
- name: Set up Ruby
34+
- uses: actions/checkout@v3
35+
- name: Set up Ruby ${{ matrix.ruby-version }}
2736
uses: ruby/setup-ruby@v1
2837
with:
29-
ruby-version: "2.6"
38+
ruby-version: ${{ matrix.ruby-version }}
3039
- name: Install dependencies
3140
run: bundle install
3241
- name: Run tests

.github/workflows/gem-push.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ jobs:
1212
contents: read
1313

1414
steps:
15-
- uses: actions/checkout@v2
16-
- name: Set up Ruby 2.7
15+
- uses: actions/checkout@v3
16+
- name: Set up Ruby 3.0
1717
uses: actions/setup-ruby@v1
1818
with:
19-
ruby-version: 2.7.x
19+
ruby-version: 3.0.x
2020

2121
- name: Publish to RubyGems
2222
env:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ test/version_tmp
1919
tmp
2020
.byebug_history
2121
polymorphic_integer_type_test
22+
gemfiles/*.lock

gemfiles/Gemfile.rails-7.0-stable

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# frozen_string_literal: true
2+
3+
source "https://rubygems.org"
4+
5+
gemspec path: ".."
6+
7+
gem "activerecord", github: "rails/rails", branch: "7-0-stable"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module PolymorphicIntegerType
2-
VERSION = "3.1.1"
2+
VERSION = "3.2.0"
33
end

polymorphic_integer_type.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
1818
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
1919
spec.require_paths = ["lib"]
2020

21-
spec.add_dependency "activerecord"
21+
spec.add_dependency "activerecord", "< 7.1"
2222
spec.add_development_dependency "bundler"
2323
spec.add_development_dependency "rake"
2424
spec.add_development_dependency "rspec"

0 commit comments

Comments
 (0)