Skip to content

Commit

Permalink
Support rails 7.1 (#169)
Browse files Browse the repository at this point in the history
* Support rails 7.1

- clean up Github Action workflow file
- allow rails 7.1.x
- run tests with ruby 3.0, 3.1 and 3.2

* fix casing in Minitest constant
  • Loading branch information
mathieujobin authored Oct 30, 2023
1 parent 161f87b commit 6930425
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 19 deletions.
34 changes: 19 additions & 15 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,27 @@ jobs:
fail-fast: false
matrix:
ruby:
- 2.7
- 2.6
- '2.7'
- '3.0'
- '3.1'
- '3.2'
gemfile:
- rails_5.0.gemfile
- rails_5.0_sprockets4.gemfile
- rails_5.2.gemfile
- rails_5.2_sprockets4.gemfile
- rails_6.0.gemfile
- rails_6.1.gemfile
- rails_7.0.gemfile
#- rails_head.gemfile
#- rails_head_sprockets4.gemfile
exclude:
- gemfile: rails_7.0.gemfile
ruby: 2.6
- rails_6.0
- rails_6.1
- rails_7.0
- rails_7.1
include:
- gemfile: rails_5.0
ruby: '2.6'
- gemfile: rails_5.0_sprockets4
ruby: '2.6'
- gemfile: rails_5.2
ruby: '2.7'
- gemfile: rails_5.2_sprockets4
ruby: '2.7'

env:
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
AWS_REGION: us-east1
steps:
- uses: actions/checkout@v2
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

### [Unreleased]

### 1.2.1

- Support Rails 7.1

### 1.2.0

- Support Rails 7
Expand Down
2 changes: 1 addition & 1 deletion angular-rails-templates.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Gem::Specification.new do |s|

s.require_paths = ["lib"]

s.add_dependency "railties", ">= 5.0", "< 7.1"
s.add_dependency "railties", ">= 5.0", "< 7.2"
s.add_dependency "sprockets", ">= 3.0", '< 5'
s.add_dependency "sprockets-rails"
s.add_dependency "tilt"
Expand Down
10 changes: 10 additions & 0 deletions gemfiles/rails_7.1.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
source "https://rubygems.org"

gem "rails", "~> 7.1.1"
gem "slim-rails"
gem "haml"
gem "kramdown"

gem 'coveralls', require: false

gemspec :path => ".././"
2 changes: 1 addition & 1 deletion lib/angular-rails-templates/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module AngularRailsTemplates
VERSION = '1.2.0'
VERSION = '1.2.1'
end
4 changes: 2 additions & 2 deletions test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
Rails.backtrace_cleaner.remove_silencers!

# Support MiniTest 4/5
Minitest::Test = MiniTest::Unit::TestCase unless defined? Minitest::Test
Minitest::Test = Minitest::Unit::TestCase unless defined? Minitest::Test

class IntegrationTest < MiniTest::Spec
class IntegrationTest < Minitest::Spec
include Capybara::DSL
register_spec_type(/integration$/, self)
end

0 comments on commit 6930425

Please sign in to comment.