diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b75e6cd..896fb61 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 diff --git a/CHANGELOG.md b/CHANGELOG.md index a95c7a4..5aff2a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ### [Unreleased] +### 1.2.1 + +- Support Rails 7.1 + ### 1.2.0 - Support Rails 7 diff --git a/angular-rails-templates.gemspec b/angular-rails-templates.gemspec index ee69e65..5fcdbf0 100644 --- a/angular-rails-templates.gemspec +++ b/angular-rails-templates.gemspec @@ -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" diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile new file mode 100644 index 0000000..61c2b64 --- /dev/null +++ b/gemfiles/rails_7.1.gemfile @@ -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 => ".././" diff --git a/lib/angular-rails-templates/version.rb b/lib/angular-rails-templates/version.rb index dacb26d..04c89a2 100644 --- a/lib/angular-rails-templates/version.rb +++ b/lib/angular-rails-templates/version.rb @@ -1,3 +1,3 @@ module AngularRailsTemplates - VERSION = '1.2.0' + VERSION = '1.2.1' end diff --git a/test/test_helper.rb b/test/test_helper.rb index 6ee1148..f8040ef 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -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