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

Adds rails 7.1 #11

Merged
merged 1 commit into from
Dec 21, 2023
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 66 additions & 26 deletions .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
@@ -1,32 +1,72 @@
name: Ruby Gem

on:
push:
branches: [ "master" ]
pull_request:
types: [ opened, synchronize, reopened, edited, ready_for_review ]

name: Test
on: [push, pull_request]
jobs:
build:
name: Build
runs-on: ubuntu-latest
permissions:
contents: read
test:
strategy:
fail-fast: false
matrix:
ruby-version: ['2.7', '3.0', '3.1']

gemfile:
- Gemfile
- gemfiles/Gemfile-rails-7-0
- gemfiles/Gemfile-rails-6-1
- gemfiles/Gemfile-rails-6-0
- gemfiles/Gemfile-rails-5-2
- gemfiles/Gemfile-rails-5-1
- gemfiles/Gemfile-rails-5-0
ruby:
- '3.2'
- '3.1'
- '3.0'
- '2.7'
- '2.6'
- '2.5'
exclude:
- gemfile: Gemfile
ruby: '2.6'
- gemfile: Gemfile
ruby: '2.5'
- gemfile: gemfiles/Gemfile-rails-7-0
ruby: '2.6'
- gemfile: gemfiles/Gemfile-rails-7-0
ruby: '2.5'
- gemfile: gemfiles/Gemfile-rails-6-0
ruby: '3.2'
- gemfile: gemfiles/Gemfile-rails-6-0
ruby: '3.1'
- gemfile: gemfiles/Gemfile-rails-5-2
ruby: '3.2'
- gemfile: gemfiles/Gemfile-rails-5-2
ruby: '3.1'
- gemfile: gemfiles/Gemfile-rails-5-2
ruby: '3.0'
- gemfile: gemfiles/Gemfile-rails-5-2
ruby: '2.7'
- gemfile: gemfiles/Gemfile-rails-5-1
ruby: '3.2'
- gemfile: gemfiles/Gemfile-rails-5-1
ruby: '3.1'
- gemfile: gemfiles/Gemfile-rails-5-1
ruby: '3.0'
- gemfile: gemfiles/Gemfile-rails-5-1
ruby: '2.7'
- gemfile: gemfiles/Gemfile-rails-5-0
ruby: '3.2'
- gemfile: gemfiles/Gemfile-rails-5-0
ruby: '3.1'
- gemfile: gemfiles/Gemfile-rails-5-0
ruby: '3.0'
- gemfile: gemfiles/Gemfile-rails-5-0
ruby: '2.7'
runs-on: ubuntu-latest
env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
steps:
- uses: actions/checkout@v3

- name: Set up Ruby
uses: ruby/setup-ruby@v1
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby-version }}
bundler-cache: true # runs 'bundle install' and caches installed gems automatically

- name: Install Appraisal dependencies
run: bundle exec appraisal install

- name: Run Appraisals
run: bundle exec appraisal rake
ruby-version: ${{ matrix.ruby }}
bundler-cache: true # runs bundle install and caches installed gems automatically
- name: Install
run: gem install bundler -v 2.3.26
- name: Run tests
run: bundle exec rake
23 changes: 0 additions & 23 deletions Appraisals

This file was deleted.

7 changes: 5 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
source "http://rubygems.org"
source 'https://rubygems.org'

gemspec

gem 'appraisal', "2.4.1"
gem 'pry'
gem 'rails', '~> 7.1.0'
gem 'sprockets', '~> 4.0'
gem 'test-unit', '~> 3.0'
4 changes: 2 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "rubygems"
require 'rubygems'
require 'bundler/setup'

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

desc 'Default: run unit tests.'
task :default => :test
task default: :test
27 changes: 14 additions & 13 deletions carmen-rails.gemspec
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
$:.push File.expand_path("../lib", __FILE__)
$:.push File.expand_path('../lib', __FILE__)

require "carmen/rails/version"
require 'carmen/rails/region_select_tag'
require 'carmen/rails/version'

Gem::Specification.new do |s|
s.name = "carmen-rails"
s.name = 'carmen-rails'
s.version = Carmen::Rails::VERSION
s.authors = ["Jim Benton"]
s.email = ["jim@autonomousmachine.com"]
s.homepage = "http://github.com/jim/carmen-rails"
s.summary = "Rails adapter for Carmen"
s.description = "Provides country_select and subregion_select form helpers."
s.authors = ['Jim Benton']
s.email = ['jim@autonomousmachine.com']
s.homepage = 'http://github.com/jim/carmen-rails'
s.summary = 'Rails adapter for Carmen'
s.description = 'Provides country_select and subregion_select form helpers.'

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

s.add_dependency "rails"
s.add_dependency "carmen", "~> 1.0"
s.add_dependency 'rails'
s.add_dependency 'carmen', '~> 1.0'

s.add_development_dependency "minitest"
s.add_development_dependency 'minitest'
end
7 changes: 7 additions & 0 deletions gemfiles/Gemfile-rails-5-0
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
source 'https://rubygems.org'

gemspec path: '..'

gem 'rails', '~> 5.0.0'
gem 'sprockets', '~> 3.7'
gem 'test-unit', '~> 3.0'
7 changes: 7 additions & 0 deletions gemfiles/Gemfile-rails-5-1
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
source 'https://rubygems.org'

gemspec path: '..'

gem 'rails', '~> 5.1.0'
gem 'sprockets', '~> 3.7'
gem 'test-unit', '~> 3.0'
7 changes: 7 additions & 0 deletions gemfiles/Gemfile-rails-5-2
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
source 'https://rubygems.org'

gemspec path: '..'

gem 'rails', '~> 5.2.0'
gem 'sprockets', '~> 3.7'
gem 'test-unit', '~> 3.0'
7 changes: 7 additions & 0 deletions gemfiles/Gemfile-rails-6-0
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
source 'https://rubygems.org'

gemspec path: '..'

gem 'rails', '~> 6.0.0'
gem 'sprockets', '~> 4.0'
gem 'test-unit', '~> 3.0'
7 changes: 7 additions & 0 deletions gemfiles/Gemfile-rails-6-1
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
source 'https://rubygems.org'

gemspec path: '..'

gem 'rails', '~> 6.1.0'
gem 'sprockets', '~> 4.0'
gem 'test-unit', '~> 3.0'
7 changes: 7 additions & 0 deletions gemfiles/Gemfile-rails-7-0
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
source 'https://rubygems.org'

gemspec path: '..'

gem 'rails', '~> 7.0.0'
gem 'sprockets', '~> 4.0'
gem 'test-unit', '~> 3.0'
10 changes: 0 additions & 10 deletions gemfiles/rails_5.2.gemfile

This file was deleted.

154 changes: 0 additions & 154 deletions gemfiles/rails_5.2.gemfile.lock

This file was deleted.

Loading