From 6007042a675a9a1956c9671cbd677b57afcbf325 Mon Sep 17 00:00:00 2001 From: Ivan Zinovyev Date: Tue, 9 Sep 2025 11:18:11 +0300 Subject: [PATCH 1/7] [BILL-6510] Update Activesupport version --- .github/workflows/tests.yml | 1 + clockwork.gemspec | 2 +- gemfiles/activesupport_7_1.gemfile | 3 + gemfiles/activesupport_7_1.gemfile.lock | 138 ++++++++++++++++++++++++ 4 files changed, 143 insertions(+), 1 deletion(-) create mode 100644 gemfiles/activesupport_7_1.gemfile create mode 100644 gemfiles/activesupport_7_1.gemfile.lock diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b95a898..ed4535c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -21,6 +21,7 @@ jobs: - activesupport_6_0.gemfile - activesupport_6_1.gemfile - activesupport_7_0.gemfile + - activesupport_7_1.gemfile env: BUNDLE_GEMFILE: gemfiles/${{ matrix.rails-version-gemfile }} steps: diff --git a/clockwork.gemspec b/clockwork.gemspec index db983ef..054447a 100644 --- a/clockwork.gemspec +++ b/clockwork.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |s| s.require_paths = ["lib"] s.add_dependency 'tzinfo' - s.add_dependency 'activesupport', '>= 6.0', '< 7.1' + s.add_dependency 'activesupport', '>= 6.0', '< 7.2' s.add_development_dependency "bundler" s.add_development_dependency "rake" diff --git a/gemfiles/activesupport_7_1.gemfile b/gemfiles/activesupport_7_1.gemfile new file mode 100644 index 0000000..ad64b52 --- /dev/null +++ b/gemfiles/activesupport_7_1.gemfile @@ -0,0 +1,3 @@ +eval_gemfile 'base.gemfile' + +gem 'activesupport', '~> 7.1' diff --git a/gemfiles/activesupport_7_1.gemfile.lock b/gemfiles/activesupport_7_1.gemfile.lock new file mode 100644 index 0000000..311aa65 --- /dev/null +++ b/gemfiles/activesupport_7_1.gemfile.lock @@ -0,0 +1,138 @@ +PATH + remote: .. + specs: + clockwork (1.2.0) + activesupport (>= 6.0, < 7.2) + tzinfo + +GEM + remote: https://rubygems.org/ + specs: + activesupport (7.1.5.2) + base64 + benchmark (>= 0.3) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + logger (>= 1.4.2) + minitest (>= 5.1) + mutex_m + securerandom (>= 0.3) + tzinfo (~> 2.0) + base64 (0.3.0) + benchmark (0.4.1) + bigdecimal (3.2.3) + coderay (1.1.3) + concurrent-ruby (1.3.5) + connection_pool (2.5.4) + daemons (1.4.1) + diff-lcs (1.6.2) + drb (2.2.3) + ffi (1.17.2) + ffi (1.17.2-aarch64-linux-gnu) + ffi (1.17.2-aarch64-linux-musl) + ffi (1.17.2-arm-linux-gnu) + ffi (1.17.2-arm-linux-musl) + ffi (1.17.2-arm64-darwin) + ffi (1.17.2-x86-linux-gnu) + ffi (1.17.2-x86-linux-musl) + ffi (1.17.2-x86_64-darwin) + ffi (1.17.2-x86_64-linux-gnu) + ffi (1.17.2-x86_64-linux-musl) + formatador (1.2.0) + reline + guard (2.19.1) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + logger (~> 1.6) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + ostruct (~> 0.6) + pry (>= 0.13.0) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-rspec (4.7.3) + guard (~> 2.1) + guard-compat (~> 1.1) + rspec (>= 2.99.0, < 4.0) + i18n (1.14.7) + concurrent-ruby (~> 1.0) + io-console (0.8.1) + listen (3.9.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + logger (1.7.0) + lumberjack (1.4.1) + method_source (1.1.0) + minitest (5.25.5) + mocha (2.7.1) + ruby2_keywords (>= 0.0.5) + mutex_m (0.3.0) + nenv (0.3.0) + notiffany (0.1.3) + nenv (~> 0.1) + shellany (~> 0.0) + ostruct (0.6.3) + power_assert (2.0.5) + pry (0.15.2) + coderay (~> 1.1) + method_source (~> 1.0) + rake (13.3.0) + rb-fsevent (0.11.2) + rb-inotify (0.11.1) + ffi (~> 1.0) + reline (0.6.2) + io-console (~> 0.5) + rspec (3.13.1) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.5) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.5) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.5) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-support (3.13.5) + ruby2_keywords (0.0.5) + securerandom (0.4.1) + shellany (0.0.1) + test-unit (3.7.0) + power_assert + thor (1.4.0) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + +PLATFORMS + aarch64-linux-gnu + aarch64-linux-musl + arm-linux-gnu + arm-linux-musl + arm64-darwin + ruby + x86-linux-gnu + x86-linux-musl + x86_64-darwin + x86_64-linux-gnu + x86_64-linux-musl + +DEPENDENCIES + activesupport (~> 7.1) + bundler + clockwork! + daemons + guard-rspec + minitest (~> 5.1) + mocha + rake + rspec + test-unit + +BUNDLED WITH + 2.7.1 From 7243fd1d3d7f6df3154696bb66616fe28f0413ca Mon Sep 17 00:00:00 2001 From: Ivan Zinovyev Date: Wed, 10 Sep 2025 17:15:40 +0300 Subject: [PATCH 2/7] Upd --- gemfiles/activesupport_6_0.gemfile.lock | 3 ++- gemfiles/activesupport_6_1.gemfile.lock | 3 ++- gemfiles/activesupport_7_0.gemfile.lock | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gemfiles/activesupport_6_0.gemfile.lock b/gemfiles/activesupport_6_0.gemfile.lock index 13dcc4d..724c63c 100644 --- a/gemfiles/activesupport_6_0.gemfile.lock +++ b/gemfiles/activesupport_6_0.gemfile.lock @@ -2,7 +2,7 @@ PATH remote: .. specs: clockwork (1.2.0) - activesupport (>= 6.0, < 7.1) + activesupport (>= 6.0, < 7.2) tzinfo GEM @@ -80,6 +80,7 @@ GEM zeitwerk (2.6.6) PLATFORMS + arm64-darwin-24 x86_64-darwin-20 x86_64-linux diff --git a/gemfiles/activesupport_6_1.gemfile.lock b/gemfiles/activesupport_6_1.gemfile.lock index ce9c350..95258c7 100644 --- a/gemfiles/activesupport_6_1.gemfile.lock +++ b/gemfiles/activesupport_6_1.gemfile.lock @@ -2,7 +2,7 @@ PATH remote: .. specs: clockwork (1.2.0) - activesupport (>= 6.0, < 7.1) + activesupport (>= 6.0, < 7.2) tzinfo GEM @@ -79,6 +79,7 @@ GEM zeitwerk (2.6.6) PLATFORMS + arm64-darwin-24 x86_64-darwin-20 x86_64-linux diff --git a/gemfiles/activesupport_7_0.gemfile.lock b/gemfiles/activesupport_7_0.gemfile.lock index 04fd9d4..ead1fe4 100644 --- a/gemfiles/activesupport_7_0.gemfile.lock +++ b/gemfiles/activesupport_7_0.gemfile.lock @@ -2,7 +2,7 @@ PATH remote: .. specs: clockwork (1.2.0) - activesupport (>= 6.0, < 7.1) + activesupport (>= 6.0, < 7.2) tzinfo GEM @@ -77,6 +77,7 @@ GEM concurrent-ruby (~> 1.0) PLATFORMS + arm64-darwin-24 x86_64-darwin-20 x86_64-linux From cd5720c91ada236fa79972ba453b58b8251a7109 Mon Sep 17 00:00:00 2001 From: Ivan Zinovyev Date: Thu, 11 Sep 2025 00:21:05 +0300 Subject: [PATCH 3/7] Upd --- gemfiles/activesupport_7_1.gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemfiles/activesupport_7_1.gemfile.lock b/gemfiles/activesupport_7_1.gemfile.lock index 311aa65..2fe57fa 100644 --- a/gemfiles/activesupport_7_1.gemfile.lock +++ b/gemfiles/activesupport_7_1.gemfile.lock @@ -135,4 +135,4 @@ DEPENDENCIES test-unit BUNDLED WITH - 2.7.1 + 2.3.26 From 48ac2ec662cd7810f14f0446aa5ccdfe3dd2ac09 Mon Sep 17 00:00:00 2001 From: Ivan Zinovyev Date: Thu, 11 Sep 2025 00:21:23 +0300 Subject: [PATCH 4/7] Upd --- gemfiles/activesupport_7_1.gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemfiles/activesupport_7_1.gemfile.lock b/gemfiles/activesupport_7_1.gemfile.lock index 2fe57fa..23d6d51 100644 --- a/gemfiles/activesupport_7_1.gemfile.lock +++ b/gemfiles/activesupport_7_1.gemfile.lock @@ -135,4 +135,4 @@ DEPENDENCIES test-unit BUNDLED WITH - 2.3.26 + 2.3.26 From a8330688427e10385538e42a328aba69998633d5 Mon Sep 17 00:00:00 2001 From: Ivan Zinovyev Date: Thu, 11 Sep 2025 13:20:56 +0300 Subject: [PATCH 5/7] Upd --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ed4535c..0235de1 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ruby-version: ['2.7.7', '3.0.5', '3.2'] + ruby-version: ['3.2'] rails-version-gemfile: - activesupport_6_0.gemfile - activesupport_6_1.gemfile From 257b703175740405a2e402297e1354b0ac6c9338 Mon Sep 17 00:00:00 2001 From: Ivan Zinovyev Date: Thu, 11 Sep 2025 14:11:42 +0300 Subject: [PATCH 6/7] Revert "Upd" This reverts commit a8330688427e10385538e42a328aba69998633d5. --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0235de1..ed4535c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ruby-version: ['3.2'] + ruby-version: ['2.7.7', '3.0.5', '3.2'] rails-version-gemfile: - activesupport_6_0.gemfile - activesupport_6_1.gemfile From 63b6d3cc557942ad9cb336117bad32022f964c48 Mon Sep 17 00:00:00 2001 From: Ivan Zinovyev Date: Thu, 11 Sep 2025 14:12:41 +0300 Subject: [PATCH 7/7] Upd --- .github/workflows/tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ed4535c..22a9ca9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -21,7 +21,9 @@ jobs: - activesupport_6_0.gemfile - activesupport_6_1.gemfile - activesupport_7_0.gemfile - - activesupport_7_1.gemfile + include: + - ruby-version: '3.2' + rails-version-gemfile: activesupport_7_1.gemfile env: BUNDLE_GEMFILE: gemfiles/${{ matrix.rails-version-gemfile }} steps: