diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d9f9e92..a53f7ea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,12 +3,12 @@ name: build on: push: branches: - - 'master' - - 'development' + - "master" + - "development" pull_request: branches: - - '**' - - '!images' + - "**" + - "!images" jobs: build: @@ -24,6 +24,7 @@ jobs: - gemfiles/Gemfile.rails-6.1 - gemfiles/Gemfile.rails-7.0 - gemfiles/Gemfile.rails-7.1 + - gemfiles/Gemfile.rails-7.2 orm: - active_record - mongoid @@ -44,22 +45,24 @@ jobs: ruby-version: 3.1.6 - gemfile: gemfiles/Gemfile.rails-7.1 ruby-version: 3.2.4 + - gemfile: gemfiles/Gemfile.rails-7.2 + ruby-version: 3.3.4 - gemfile: Gemfile - ruby-version: 3.3.3 + ruby-version: 3.3.4 orm: active_record test-db: mysql - gemfile: Gemfile - ruby-version: 3.3.3 + ruby-version: 3.3.4 orm: active_record test-db: postgresql - gemfile: Gemfile - ruby-version: 3.3.3 + ruby-version: 3.3.4 orm: mongoid test-db: mongodb - gemfile: Gemfile ruby-version: head orm: active_record - allow_failures: 'true' + allow_failures: "true" exclude: - gemfile: gemfiles/Gemfile.rails-6.0 orm: dynamoid @@ -69,6 +72,8 @@ jobs: orm: dynamoid - gemfile: gemfiles/Gemfile.rails-7.1 orm: dynamoid + - gemfile: gemfiles/Gemfile.rails-7.2 + orm: dynamoid env: RAILS_ENV: test diff --git a/Gemfile b/Gemfile index a19e085..28a86fe 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' gemspec -gem 'rails', '~> 7.1.0' +gem 'rails', '~> 7.2.0' group :production do gem 'sprockets-rails' diff --git a/activity_notification.gemspec b/activity_notification.gemspec index 611ea57..cbceb0c 100644 --- a/activity_notification.gemspec +++ b/activity_notification.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |s| s.require_paths = ["lib"] s.required_ruby_version = '>= 2.1.0' - s.add_dependency 'railties', '>= 5.0.0', '< 7.2' + s.add_dependency 'railties', '>= 5.0.0', '< 8' s.add_dependency 'i18n', '>= 0.5.0' s.add_dependency 'jquery-rails', '>= 3.1.1' s.add_dependency 'swagger-blocks', '>= 3.0.0' diff --git a/gemfiles/Gemfile.rails-7.2 b/gemfiles/Gemfile.rails-7.2 new file mode 100644 index 0000000..4593852 --- /dev/null +++ b/gemfiles/Gemfile.rails-7.2 @@ -0,0 +1,23 @@ +source 'https://rubygems.org' + +gemspec path: '../' + +gem 'rails', '~> 7.2.0' +gem 'sprockets-rails' + +group :development do + gem 'bullet' + gem 'rack-cors' +end + +group :test do + gem 'rails-controller-testing' + gem 'ammeter' + gem 'timecop' + gem 'committee' + gem 'committee-rails', '< 0.6' + # gem 'coveralls', require: false + gem 'coveralls_reborn', require: false +end + +gem 'dotenv-rails', groups: [:development, :test]