From 4d363657584151d90a58da97739360fa9037c2bc Mon Sep 17 00:00:00 2001 From: mtakeda <53254554+mtakeda15@users.noreply.github.com> Date: Tue, 21 Jan 2025 16:12:51 +0900 Subject: [PATCH] update test matrix & release 1.0.6 (#61) * update test matrix * uncomment exclude: * rails-8.0.Gemfile -> rails-8.Gemfile * remove rails 7.2, 8.0 * release 1.0.6 * add rails 7.2 * fix scimaenaga.gemspec * fix rails-7.2.Gemfile * add some versions * fix gemspec. rails <= 7.2 -> rails < 7.3 --- .github/gemfiles/rails-5.2.4.6.Gemfile | 6 -- .github/gemfiles/rails-5.2.6.Gemfile | 6 -- .github/gemfiles/rails-6.0.3.7.Gemfile | 6 -- .github/gemfiles/rails-6.0.4.1.Gemfile | 6 -- .github/gemfiles/rails-6.1.3.2.Gemfile | 6 -- .github/gemfiles/rails-6.1.4.1.Gemfile | 6 -- .github/gemfiles/rails-6.1.7.2.Gemfile | 6 -- .github/gemfiles/rails-6.1.7.3.Gemfile | 6 -- ...-7.0.4.3.Gemfile => rails-7.0.7.2.Gemfile} | 2 +- .github/gemfiles/rails-7.0.8.7.Gemfile | 10 +++ ...ails-7.1.Gemfile => rails-7.1.4.2.Gemfile} | 2 +- .github/gemfiles/rails-7.1.5.1.Gemfile | 9 ++ .github/gemfiles/rails-7.2.1.2.Gemfile | 9 ++ .github/gemfiles/rails-7.2.2.1.Gemfile | 9 ++ .github/workflows/test.yaml | 87 +++++++++---------- CHANGELOG.md | 4 + lib/scimaenaga/version.rb | 2 +- scimaenaga.gemspec | 2 +- 18 files changed, 85 insertions(+), 99 deletions(-) delete mode 100644 .github/gemfiles/rails-5.2.4.6.Gemfile delete mode 100644 .github/gemfiles/rails-5.2.6.Gemfile delete mode 100644 .github/gemfiles/rails-6.0.3.7.Gemfile delete mode 100644 .github/gemfiles/rails-6.0.4.1.Gemfile delete mode 100644 .github/gemfiles/rails-6.1.3.2.Gemfile delete mode 100644 .github/gemfiles/rails-6.1.4.1.Gemfile delete mode 100644 .github/gemfiles/rails-6.1.7.2.Gemfile delete mode 100644 .github/gemfiles/rails-6.1.7.3.Gemfile rename .github/gemfiles/{rails-7.0.4.3.Gemfile => rails-7.0.7.2.Gemfile} (90%) create mode 100644 .github/gemfiles/rails-7.0.8.7.Gemfile rename .github/gemfiles/{rails-7.1.Gemfile => rails-7.1.4.2.Gemfile} (89%) create mode 100644 .github/gemfiles/rails-7.1.5.1.Gemfile create mode 100644 .github/gemfiles/rails-7.2.1.2.Gemfile create mode 100644 .github/gemfiles/rails-7.2.2.1.Gemfile diff --git a/.github/gemfiles/rails-5.2.4.6.Gemfile b/.github/gemfiles/rails-5.2.4.6.Gemfile deleted file mode 100644 index cee91074..00000000 --- a/.github/gemfiles/rails-5.2.4.6.Gemfile +++ /dev/null @@ -1,6 +0,0 @@ -source 'https://rubygems.org' - -gemspec path: '../..' - -gem "rails", "5.2.4.6" -gem 'concurrent-ruby', '1.3.4' \ No newline at end of file diff --git a/.github/gemfiles/rails-5.2.6.Gemfile b/.github/gemfiles/rails-5.2.6.Gemfile deleted file mode 100644 index eba4849b..00000000 --- a/.github/gemfiles/rails-5.2.6.Gemfile +++ /dev/null @@ -1,6 +0,0 @@ -source 'https://rubygems.org' - -gemspec path: '../..' - -gem "rails", "5.2.6" -gem 'concurrent-ruby', '1.3.4' \ No newline at end of file diff --git a/.github/gemfiles/rails-6.0.3.7.Gemfile b/.github/gemfiles/rails-6.0.3.7.Gemfile deleted file mode 100644 index 2e7e2da4..00000000 --- a/.github/gemfiles/rails-6.0.3.7.Gemfile +++ /dev/null @@ -1,6 +0,0 @@ -source 'https://rubygems.org' - -gemspec path: '../..' - -gem "rails", "6.0.3.7" -gem 'concurrent-ruby', '1.3.4' \ No newline at end of file diff --git a/.github/gemfiles/rails-6.0.4.1.Gemfile b/.github/gemfiles/rails-6.0.4.1.Gemfile deleted file mode 100644 index 544d23b6..00000000 --- a/.github/gemfiles/rails-6.0.4.1.Gemfile +++ /dev/null @@ -1,6 +0,0 @@ -source 'https://rubygems.org' - -gemspec path: '../..' - -gem "rails", "6.0.4.1" -gem 'concurrent-ruby', '1.3.4' \ No newline at end of file diff --git a/.github/gemfiles/rails-6.1.3.2.Gemfile b/.github/gemfiles/rails-6.1.3.2.Gemfile deleted file mode 100644 index d8cba69d..00000000 --- a/.github/gemfiles/rails-6.1.3.2.Gemfile +++ /dev/null @@ -1,6 +0,0 @@ -source 'https://rubygems.org' - -gemspec path: '../..' - -gem "rails", "6.1.3.2" -gem 'concurrent-ruby', '1.3.4' \ No newline at end of file diff --git a/.github/gemfiles/rails-6.1.4.1.Gemfile b/.github/gemfiles/rails-6.1.4.1.Gemfile deleted file mode 100644 index fbca99b6..00000000 --- a/.github/gemfiles/rails-6.1.4.1.Gemfile +++ /dev/null @@ -1,6 +0,0 @@ -source 'https://rubygems.org' - -gemspec path: '../..' - -gem "rails", "6.1.4.1" -gem 'concurrent-ruby', '1.3.4' \ No newline at end of file diff --git a/.github/gemfiles/rails-6.1.7.2.Gemfile b/.github/gemfiles/rails-6.1.7.2.Gemfile deleted file mode 100644 index c252cbed..00000000 --- a/.github/gemfiles/rails-6.1.7.2.Gemfile +++ /dev/null @@ -1,6 +0,0 @@ -source 'https://rubygems.org' - -gemspec path: '../..' - -gem "rails", "6.1.7.2" -gem 'concurrent-ruby', '1.3.4' \ No newline at end of file diff --git a/.github/gemfiles/rails-6.1.7.3.Gemfile b/.github/gemfiles/rails-6.1.7.3.Gemfile deleted file mode 100644 index 3c0b4678..00000000 --- a/.github/gemfiles/rails-6.1.7.3.Gemfile +++ /dev/null @@ -1,6 +0,0 @@ -source 'https://rubygems.org' - -gemspec path: '../..' - -gem "rails", "6.1.7.3" -gem 'concurrent-ruby', '1.3.4' \ No newline at end of file diff --git a/.github/gemfiles/rails-7.0.4.3.Gemfile b/.github/gemfiles/rails-7.0.7.2.Gemfile similarity index 90% rename from .github/gemfiles/rails-7.0.4.3.Gemfile rename to .github/gemfiles/rails-7.0.7.2.Gemfile index 6f56e368..37cd7686 100644 --- a/.github/gemfiles/rails-7.0.4.3.Gemfile +++ b/.github/gemfiles/rails-7.0.7.2.Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' gemspec path: '../..' -gem "rails", "7.0.4.3" +gem "rails", "7.0.7.2" gem 'concurrent-ruby', '1.3.4' # Since rails 7.0, rails does not require sprockets-rails. diff --git a/.github/gemfiles/rails-7.0.8.7.Gemfile b/.github/gemfiles/rails-7.0.8.7.Gemfile new file mode 100644 index 00000000..10b62e98 --- /dev/null +++ b/.github/gemfiles/rails-7.0.8.7.Gemfile @@ -0,0 +1,10 @@ +source 'https://rubygems.org' + +gemspec path: '../..' + +gem "rails", "7.0.8.7" +gem 'concurrent-ruby', '1.3.4' + +# Since rails 7.0, rails does not require sprockets-rails. +# This is added to run the same tests as in previous versions. +gem 'sprockets-rails' diff --git a/.github/gemfiles/rails-7.1.Gemfile b/.github/gemfiles/rails-7.1.4.2.Gemfile similarity index 89% rename from .github/gemfiles/rails-7.1.Gemfile rename to .github/gemfiles/rails-7.1.4.2.Gemfile index 0a754a8f..64ac40ea 100644 --- a/.github/gemfiles/rails-7.1.Gemfile +++ b/.github/gemfiles/rails-7.1.4.2.Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' gemspec path: '../..' -gem "rails", "~> 7.1" +gem "rails", "7.1.4.2" # Since rails 7.0, rails does not require sprockets-rails. # This is added to run the same tests as in previous versions. diff --git a/.github/gemfiles/rails-7.1.5.1.Gemfile b/.github/gemfiles/rails-7.1.5.1.Gemfile new file mode 100644 index 00000000..a89031e2 --- /dev/null +++ b/.github/gemfiles/rails-7.1.5.1.Gemfile @@ -0,0 +1,9 @@ +source 'https://rubygems.org' + +gemspec path: '../..' + +gem "rails", "7.1.5.1" + +# Since rails 7.0, rails does not require sprockets-rails. +# This is added to run the same tests as in previous versions. +gem 'sprockets-rails' diff --git a/.github/gemfiles/rails-7.2.1.2.Gemfile b/.github/gemfiles/rails-7.2.1.2.Gemfile new file mode 100644 index 00000000..9a785d9c --- /dev/null +++ b/.github/gemfiles/rails-7.2.1.2.Gemfile @@ -0,0 +1,9 @@ +source 'https://rubygems.org' + +gemspec path: '../..' + +gem "rails", "7.2.1.2" + +# Since rails 7.0, rails does not require sprockets-rails. +# This is added to run the same tests as in previous versions. +gem 'sprockets-rails' diff --git a/.github/gemfiles/rails-7.2.2.1.Gemfile b/.github/gemfiles/rails-7.2.2.1.Gemfile new file mode 100644 index 00000000..e8dcddaa --- /dev/null +++ b/.github/gemfiles/rails-7.2.2.1.Gemfile @@ -0,0 +1,9 @@ +source 'https://rubygems.org' + +gemspec path: '../..' + +gem "rails", "7.2.2.1" + +# Since rails 7.0, rails does not require sprockets-rails. +# This is added to run the same tests as in previous versions. +gem 'sprockets-rails' diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 2c1a4999..e29ee42b 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -46,14 +46,14 @@ jobs: ## test against ruby versions from the last two release cycles ## ## cf https://endoflife.date/ruby - # 2021-04-05 releases - - 3.0.1 - # 2021-07-07 releases - - 3.0.2 - # 2023-02-08 release - - 3.2.1 - # 2023-03-30 release - - 3.2.2 + # 2023-03-30 releases + - 3.0.6 + # 2024-04-23 releases + - 3.0.7 + # 2024-07-26 release + - 3.2.5 + # 2024-10-30 release + - 3.2.6 # 2025-01-15 release - 3.3.7 rails: @@ -62,50 +62,43 @@ jobs: ## .github/gemfiles ## ## cf https://endoflife.date/rails - # 2021-05-06 releases - - 6.0.3.7 - - 6.1.3.2 - # 2021-08-20 releases - - 6.0.4.1 - - 6.1.4.1 - # 2023-01-24 releases - - 6.1.7.2 - # 2023-03-13 releases - - 6.1.7.3 - # 2023-03-13 releases - - 7.0.4.3 - # 2023-10-05 releases - - 7.1 + # 2023-08-22 release + - 7.0.7.2 + # 2024-12-10 release + - 7.0.8.7 + # 2024-10-23 release + - 7.1.4.2 + # 2024-12-10 release + - 7.1.5.1 + # 2024-10-23 release + - 7.2.1.2 + # 2024-12-10 release + - 7.2.2.1 exclude: ## be careful with which versions of ruby does rails support ## cf https://www.fastruby.io/blog/ruby/rails/versions/compatibility-table.html - # rails 6.0 requires ruby < 3 - - rails: 6.0.3.7 - ruby: 3.0.1 - - rails: 6.0.3.7 - ruby: 3.0.2 - - rails: 6.0.4.1 - ruby: 3.0.1 - - rails: 6.0.4.1 - ruby: 3.0.2 - - rails: 6.0.3.7 - ruby: 3.2.1 - - rails: 6.0.4.1 - ruby: 3.2.1 - - rails: 6.1.3.2 - ruby: 3.2.1 - - rails: 6.0.3.7 - ruby: 3.2.2 - - rails: 6.0.4.1 - ruby: 3.2.2 - - rails: 6.1.3.2 - ruby: 3.2.2 - - rails: 6.0.3.7 + # rails 7.0 requires ruby < 3.1 + - rails: 7.0.7.2 + ruby: 3.2.5 + - rails: 7.0.7.2 + ruby: 3.2.6 + - rails: 7.0.7.2 ruby: 3.3.7 - - rails: 6.0.4.1 - ruby: 3.3.7 - - rails: 6.1.3.2 + - rails: 7.0.8.7 + ruby: 3.2.5 + - rails: 7.0.8.7 + ruby: 3.2.6 + - rails: 7.0.8.7 ruby: 3.3.7 + # rails 7.2 requires ruby >= 3.1 + - rails: 7.2.1.2 + ruby: 3.0.6 + - rails: 7.2.1.2 + ruby: 3.0.7 + - rails: 7.2.2.1 + ruby: 3.0.6 + - rails: 7.2.2.1 + ruby: 3.0.7 env: RAILS_ENV: test diff --git a/CHANGELOG.md b/CHANGELOG.md index 899fce8d..1163e6df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Upcoming Release +# v1.0.6 01-18-2025 + +- [Support Ruby 3.3.7](https://github.com/StudistCorporation/scimaenaga/pull/58) + # v1.0.5 11-08-2024 - [Support Ruby 3.3.6](https://github.com/StudistCorporation/scimaenaga/pull/56) diff --git a/lib/scimaenaga/version.rb b/lib/scimaenaga/version.rb index 4bcc4ca7..c71c4fa4 100644 --- a/lib/scimaenaga/version.rb +++ b/lib/scimaenaga/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Scimaenaga - VERSION = '1.0.5' + VERSION = '1.0.6' end diff --git a/scimaenaga.gemspec b/scimaenaga.gemspec index 2c2ef0d7..11b701fa 100644 --- a/scimaenaga.gemspec +++ b/scimaenaga.gemspec @@ -16,7 +16,7 @@ Gem::Specification.new do |s| s.files = Dir['{app,config,db,lib}/**/*', 'MIT-LICENSE', 'Rakefile', 'README.md'] s.required_ruby_version = '>= 2.5.9', '<= 3.3.7' - s.add_dependency 'rails', '>= 5.2.4.6', '< 7.2' + s.add_dependency 'rails', '>= 7.0', '< 7.3' s.add_runtime_dependency 'jwt', '>= 1.5' s.test_files = Dir['spec/**/*']