Skip to content

Commit a69e807

Browse files
yuri-zubovyuri-zubov
authored
Add Rails 7.1 support (#11)
1 parent c0d6c7e commit a69e807

25 files changed

+204
-825
lines changed

‎.github/workflows/ruby.yml

+66-26
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,72 @@
1-
name: Ruby Gem
2-
3-
on:
4-
push:
5-
branches: [ "master" ]
6-
pull_request:
7-
types: [ opened, synchronize, reopened, edited, ready_for_review ]
8-
1+
name: Test
2+
on: [push, pull_request]
93
jobs:
10-
build:
11-
name: Build
12-
runs-on: ubuntu-latest
13-
permissions:
14-
contents: read
4+
test:
155
strategy:
6+
fail-fast: false
167
matrix:
17-
ruby-version: ['2.7', '3.0', '3.1']
18-
8+
gemfile:
9+
- Gemfile
10+
- gemfiles/Gemfile-rails-7-0
11+
- gemfiles/Gemfile-rails-6-1
12+
- gemfiles/Gemfile-rails-6-0
13+
- gemfiles/Gemfile-rails-5-2
14+
- gemfiles/Gemfile-rails-5-1
15+
- gemfiles/Gemfile-rails-5-0
16+
ruby:
17+
- '3.2'
18+
- '3.1'
19+
- '3.0'
20+
- '2.7'
21+
- '2.6'
22+
- '2.5'
23+
exclude:
24+
- gemfile: Gemfile
25+
ruby: '2.6'
26+
- gemfile: Gemfile
27+
ruby: '2.5'
28+
- gemfile: gemfiles/Gemfile-rails-7-0
29+
ruby: '2.6'
30+
- gemfile: gemfiles/Gemfile-rails-7-0
31+
ruby: '2.5'
32+
- gemfile: gemfiles/Gemfile-rails-6-0
33+
ruby: '3.2'
34+
- gemfile: gemfiles/Gemfile-rails-6-0
35+
ruby: '3.1'
36+
- gemfile: gemfiles/Gemfile-rails-5-2
37+
ruby: '3.2'
38+
- gemfile: gemfiles/Gemfile-rails-5-2
39+
ruby: '3.1'
40+
- gemfile: gemfiles/Gemfile-rails-5-2
41+
ruby: '3.0'
42+
- gemfile: gemfiles/Gemfile-rails-5-2
43+
ruby: '2.7'
44+
- gemfile: gemfiles/Gemfile-rails-5-1
45+
ruby: '3.2'
46+
- gemfile: gemfiles/Gemfile-rails-5-1
47+
ruby: '3.1'
48+
- gemfile: gemfiles/Gemfile-rails-5-1
49+
ruby: '3.0'
50+
- gemfile: gemfiles/Gemfile-rails-5-1
51+
ruby: '2.7'
52+
- gemfile: gemfiles/Gemfile-rails-5-0
53+
ruby: '3.2'
54+
- gemfile: gemfiles/Gemfile-rails-5-0
55+
ruby: '3.1'
56+
- gemfile: gemfiles/Gemfile-rails-5-0
57+
ruby: '3.0'
58+
- gemfile: gemfiles/Gemfile-rails-5-0
59+
ruby: '2.7'
60+
runs-on: ubuntu-latest
61+
env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
62+
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
1963
steps:
2064
- uses: actions/checkout@v3
21-
22-
- name: Set up Ruby
23-
uses: ruby/setup-ruby@v1
65+
- uses: ruby/setup-ruby@v1
2466
with:
25-
ruby-version: ${{ matrix.ruby-version }}
26-
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
27-
28-
- name: Install Appraisal dependencies
29-
run: bundle exec appraisal install
30-
31-
- name: Run Appraisals
32-
run: bundle exec appraisal rake
67+
ruby-version: ${{ matrix.ruby }}
68+
bundler-cache: true # runs bundle install and caches installed gems automatically
69+
- name: Install
70+
run: gem install bundler -v 2.3.26
71+
- name: Run tests
72+
run: bundle exec rake

‎Appraisals

-23
This file was deleted.

‎Gemfile

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
source "http://rubygems.org"
1+
source 'https://rubygems.org'
22

33
gemspec
44

5-
gem 'appraisal', "2.4.1"
5+
gem 'pry'
6+
gem 'rails', '~> 7.1.0'
7+
gem 'sprockets', '~> 4.0'
8+
gem 'test-unit', '~> 3.0'

‎Rakefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require "rubygems"
1+
require 'rubygems'
22
require 'bundler/setup'
33

44
require 'rake'
@@ -15,4 +15,4 @@ Rake::TestTask.new(:test) do |t|
1515
end
1616

1717
desc 'Default: run unit tests.'
18-
task :default => :test
18+
task default: :test

‎carmen-rails.gemspec

+14-13
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1-
$:.push File.expand_path("../lib", __FILE__)
1+
$:.push File.expand_path('../lib', __FILE__)
22

3-
require "carmen/rails/version"
3+
require 'carmen/rails/region_select_tag'
4+
require 'carmen/rails/version'
45

56
Gem::Specification.new do |s|
6-
s.name = "carmen-rails"
7+
s.name = 'carmen-rails'
78
s.version = Carmen::Rails::VERSION
8-
s.authors = ["Jim Benton"]
9-
s.email = ["[email protected]"]
10-
s.homepage = "http://github.com/jim/carmen-rails"
11-
s.summary = "Rails adapter for Carmen"
12-
s.description = "Provides country_select and subregion_select form helpers."
9+
s.authors = ['Jim Benton']
10+
s.email = ['[email protected]']
11+
s.homepage = 'http://github.com/jim/carmen-rails'
12+
s.summary = 'Rails adapter for Carmen'
13+
s.description = 'Provides country_select and subregion_select form helpers.'
1314

14-
s.files = Dir["{lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.md"]
15-
s.test_files = Dir["spec/**/*"]
15+
s.files = Dir['{lib}/**/*'] + ['MIT-LICENSE', 'Rakefile', 'README.md']
16+
s.test_files = Dir['spec/**/*']
1617

17-
s.add_dependency "rails"
18-
s.add_dependency "carmen", "~> 1.0"
18+
s.add_dependency 'rails'
19+
s.add_dependency 'carmen', '~> 1.0'
1920

20-
s.add_development_dependency "minitest"
21+
s.add_development_dependency 'minitest'
2122
end

‎gemfiles/Gemfile-rails-5-0

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
source 'https://rubygems.org'
2+
3+
gemspec path: '..'
4+
5+
gem 'rails', '~> 5.0.0'
6+
gem 'sprockets', '~> 3.7'
7+
gem 'test-unit', '~> 3.0'

‎gemfiles/Gemfile-rails-5-1

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
source 'https://rubygems.org'
2+
3+
gemspec path: '..'
4+
5+
gem 'rails', '~> 5.1.0'
6+
gem 'sprockets', '~> 3.7'
7+
gem 'test-unit', '~> 3.0'

‎gemfiles/Gemfile-rails-5-2

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
source 'https://rubygems.org'
2+
3+
gemspec path: '..'
4+
5+
gem 'rails', '~> 5.2.0'
6+
gem 'sprockets', '~> 3.7'
7+
gem 'test-unit', '~> 3.0'

‎gemfiles/Gemfile-rails-6-0

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
source 'https://rubygems.org'
2+
3+
gemspec path: '..'
4+
5+
gem 'rails', '~> 6.0.0'
6+
gem 'sprockets', '~> 4.0'
7+
gem 'test-unit', '~> 3.0'

‎gemfiles/Gemfile-rails-6-1

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
source 'https://rubygems.org'
2+
3+
gemspec path: '..'
4+
5+
gem 'rails', '~> 6.1.0'
6+
gem 'sprockets', '~> 4.0'
7+
gem 'test-unit', '~> 3.0'

‎gemfiles/Gemfile-rails-7-0

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
source 'https://rubygems.org'
2+
3+
gemspec path: '..'
4+
5+
gem 'rails', '~> 7.0.0'
6+
gem 'sprockets', '~> 4.0'
7+
gem 'test-unit', '~> 3.0'

‎gemfiles/rails_5.2.gemfile

-10
This file was deleted.

‎gemfiles/rails_5.2.gemfile.lock

-154
This file was deleted.

0 commit comments

Comments
 (0)