From 71c3cd802b9b91e3713dd3237d7338c7eaa1c5e1 Mon Sep 17 00:00:00 2001 From: Usman Date: Sat, 17 Aug 2024 13:56:13 +0200 Subject: [PATCH 1/2] Adding rails 7.2 to CI and remove ruby 3.0 --- .github/workflows/ci.yml | 6 ++---- Gemfile.lock | 2 +- gemfiles/activemodel_7.2.gemfile | 5 +++++ lib/service_record/version.rb | 2 +- service_record.gemspec | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 gemfiles/activemodel_7.2.gemfile diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f19ee67..fab15f1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,19 +13,17 @@ jobs: strategy: matrix: ruby: - - '3.0' - '3.1' - '3.2' - '3.3' + - '3.4' - 'truffleruby' gemfile: - 'activemodel_6.1' - 'activemodel_7.0' - 'activemodel_7.1' + - 'activemodel_7.2' - 'activemodel_main' - exclude: - - ruby: '3.0' - gemfile: 'activemodel_main' env: BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile diff --git a/Gemfile.lock b/Gemfile.lock index e1fffd1..b36d9c1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - service_record (1.4.2) + service_record (1.4.3) activemodel (>= 6.1) GEM diff --git a/gemfiles/activemodel_7.2.gemfile b/gemfiles/activemodel_7.2.gemfile new file mode 100644 index 0000000..7469742 --- /dev/null +++ b/gemfiles/activemodel_7.2.gemfile @@ -0,0 +1,5 @@ +source "https://rubygems.org" + +gem "activemodel", "~> 7.2" + +gemspec path: "../" diff --git a/lib/service_record/version.rb b/lib/service_record/version.rb index 5a3d50e..8e4a80c 100644 --- a/lib/service_record/version.rb +++ b/lib/service_record/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module ServiceRecord - VERSION = '1.4.2' + VERSION = '1.4.3' end diff --git a/service_record.gemspec b/service_record.gemspec index 48e259a..b48b8cf 100644 --- a/service_record.gemspec +++ b/service_record.gemspec @@ -27,7 +27,7 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ['lib'] - spec.add_runtime_dependency 'activemodel', '>= 6.1' + spec.add_dependency 'activemodel', '>= 6.1' spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rspec', '~> 3.9' From 60f65e909a6da6756e2b4dc5573d7e5deb326009 Mon Sep 17 00:00:00 2001 From: Usman Date: Sat, 17 Aug 2024 14:04:08 +0200 Subject: [PATCH 2/2] Exclude ruby 3.4 with rails 6.1 from test matrix --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fab15f1..48db774 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,6 +24,9 @@ jobs: - 'activemodel_7.1' - 'activemodel_7.2' - 'activemodel_main' + exclude: + - ruby: '3.4' + gemfile: 'activemodel_6.1' env: BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile