From 0fa9766e195a3843490df916a910e7a38c081c9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Krzy=C5=BCanowski?= Date: Wed, 28 Feb 2024 15:19:25 +0100 Subject: [PATCH 01/11] drop support for EOL rails/ruby versions --- .github/workflows/ruby.yml | 29 ++--------------------------- gush.gemspec | 2 +- 2 files changed, 3 insertions(+), 28 deletions(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 5bbcb6e..efe3465 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -26,33 +26,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - rails_version: ['4.2.7', '5.1.0', '5.2.0', '6.0.0', '6.1.0', '7.0'] - ruby-version: ['2.6', '2.7', '3.0', '3.1'] - exclude: - - ruby-version: '3.0' - rails_version: '4.2.7' - - ruby-version: '3.1' - rails_version: '4.2.7' - - ruby-version: '3.0' - rails_version: '5.0' - - ruby-version: '3.1' - rails_version: '5.0' - - ruby-version: '3.0' - rails_version: '5.1' - - ruby-version: '3.1' - rails_version: '5.1' - - ruby-version: '3.0' - rails_version: '5.2' - - ruby-version: '3.1' - rails_version: '5.2' - - ruby-version: '3.0' - rails_version: '6.0' - - ruby-version: '3.1' - rails_version: '6.0' - - ruby-version: '3.1' - rails_version: '6.1' - - ruby-version: '2.6' - rails_version: '7.0' + rails_version: ['6.1.0', '7.0', '7.1.0'] + ruby-version: ['3.0', '3.1', '3.2', '3.3'] steps: - uses: actions/checkout@v2 - name: Set up Ruby diff --git a/gush.gemspec b/gush.gemspec index 11d3e0e..0ba7f6a 100644 --- a/gush.gemspec +++ b/gush.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] - spec.add_dependency "activejob", ">= 4.2.7", "< 7.1" + spec.add_dependency "activejob", ">= 6.1.0", "<= 7.1" spec.add_dependency "concurrent-ruby", "~> 1.0" spec.add_dependency "multi_json", "~> 1.11" spec.add_dependency "redis", ">= 3.2", "< 6" From a3f58f7d24128590e014c9f9c53143b58d542e5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Krzy=C5=BCanowski?= Date: Wed, 28 Feb 2024 15:29:05 +0100 Subject: [PATCH 02/11] require active support to fix deprecator issue --- spec/spec_helper.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 22ea016..f64a892 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,3 +1,4 @@ +require 'active_support' require 'active_support/testing/time_helpers' require 'gush' require 'json' From 5f537bbf8675328b98cab2dbac2057d6dde16fad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Krzy=C5=BCanowski?= Date: Wed, 28 Feb 2024 21:43:05 +0100 Subject: [PATCH 03/11] perform job --- spec/features/integration_spec.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/spec/features/integration_spec.rb b/spec/features/integration_spec.rb index 443ffbe..e7544d9 100644 --- a/spec/features/integration_spec.rb +++ b/spec/features/integration_spec.rb @@ -5,9 +5,10 @@ context "when all jobs finish successfuly" do it "marks workflow as completed" do flow = TestWorkflow.create - perform_enqueued_jobs do - flow.start! - end + + ActiveJob::Base.queue_adapter.perform_enqueued_jobs = true + flow.start! + ActiveJob::Base.queue_adapter.perform_enqueued_jobs = false flow = flow.reload expect(flow).to be_finished From fc5d5aa8589d181172b28c5e7455c19a66518e63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Krzy=C5=BCanowski?= Date: Wed, 28 Feb 2024 22:01:47 +0100 Subject: [PATCH 04/11] Introduce Gush::VERSION --- gush.gemspec | 4 +++- lib/gush/version.rb | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 lib/gush/version.rb diff --git a/gush.gemspec b/gush.gemspec index 0ba7f6a..2a75838 100644 --- a/gush.gemspec +++ b/gush.gemspec @@ -2,9 +2,11 @@ lib = File.expand_path('../lib', __FILE__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) +require_relative 'lib/gush/version' + Gem::Specification.new do |spec| spec.name = "gush" - spec.version = "2.1.0" + spec.version = Gush::VERSION spec.authors = ["Piotrek Okoński"] spec.email = ["piotrek@okonski.org"] spec.summary = "Fast and distributed workflow runner based on ActiveJob and Redis" diff --git a/lib/gush/version.rb b/lib/gush/version.rb new file mode 100644 index 0000000..352e909 --- /dev/null +++ b/lib/gush/version.rb @@ -0,0 +1,3 @@ +module Gush + VERSION = '2.1.0' +end From f18989b0a107ef477dd3da98c69ce6d20530a450 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Krzy=C5=BCanowski?= Date: Wed, 28 Feb 2024 22:02:04 +0100 Subject: [PATCH 05/11] specify required ruby version --- gush.gemspec | 1 + 1 file changed, 1 insertion(+) diff --git a/gush.gemspec b/gush.gemspec index 2a75838..60a59dc 100644 --- a/gush.gemspec +++ b/gush.gemspec @@ -18,6 +18,7 @@ Gem::Specification.new do |spec| spec.executables = "gush" spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] + spec.required_ruby_version = '>= 3.0.0' spec.add_dependency "activejob", ">= 6.1.0", "<= 7.1" spec.add_dependency "concurrent-ruby", "~> 1.0" From 810d20ff67be5857a2c313be43bd857c83c42c7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Krzy=C5=BCanowski?= Date: Wed, 28 Feb 2024 22:02:11 +0100 Subject: [PATCH 06/11] bump dependencies --- gush.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gush.gemspec b/gush.gemspec index 60a59dc..46cb875 100644 --- a/gush.gemspec +++ b/gush.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |spec| spec.require_paths = ["lib"] spec.required_ruby_version = '>= 3.0.0' - spec.add_dependency "activejob", ">= 6.1.0", "<= 7.1" + spec.add_dependency "activejob", ">= 6.1.0", "~> 7.1" spec.add_dependency "concurrent-ruby", "~> 1.0" spec.add_dependency "multi_json", "~> 1.11" spec.add_dependency "redis", ">= 3.2", "< 6" @@ -32,7 +32,7 @@ Gem::Specification.new do |spec| spec.add_dependency "thor", ">= 0.19", "< 1.3" spec.add_dependency "launchy", "~> 2.4" spec.add_development_dependency "bundler" - spec.add_development_dependency "rake", "~> 10.4" + spec.add_development_dependency "rake", "~> 12" spec.add_development_dependency "rspec", '~> 3.0' spec.add_development_dependency "pry", '~> 0.10' end From b310bb54942c11d0a167b2d1a4cd0cddf08472df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Krzy=C5=BCanowski?= Date: Wed, 28 Feb 2024 22:09:57 +0100 Subject: [PATCH 07/11] support all 7.1.X releases --- gush.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gush.gemspec b/gush.gemspec index 46cb875..fe49816 100644 --- a/gush.gemspec +++ b/gush.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |spec| spec.require_paths = ["lib"] spec.required_ruby_version = '>= 3.0.0' - spec.add_dependency "activejob", ">= 6.1.0", "~> 7.1" + spec.add_dependency "activejob", ">= 6.1.0", "< 7.2" spec.add_dependency "concurrent-ruby", "~> 1.0" spec.add_dependency "multi_json", "~> 1.11" spec.add_dependency "redis", ">= 3.2", "< 6" From d287190bb280f9316a7beeb328ec4e29dd75ab43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Krzy=C5=BCanowski?= Date: Wed, 28 Feb 2024 22:12:39 +0100 Subject: [PATCH 08/11] use checkout@v4 --- .github/workflows/ruby.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index efe3465..67681ba 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -29,7 +29,7 @@ jobs: rails_version: ['6.1.0', '7.0', '7.1.0'] ruby-version: ['3.0', '3.1', '3.2', '3.3'] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Ruby uses: ruby/setup-ruby@v1 with: From 9336e3c83339e12c286b277cdeb8e328b49b184d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Krzy=C5=BCanowski?= Date: Wed, 28 Feb 2024 22:28:40 +0100 Subject: [PATCH 09/11] add myself to authors ;) --- gush.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gush.gemspec b/gush.gemspec index fe49816..b8c4c2a 100644 --- a/gush.gemspec +++ b/gush.gemspec @@ -7,8 +7,8 @@ require_relative 'lib/gush/version' Gem::Specification.new do |spec| spec.name = "gush" spec.version = Gush::VERSION - spec.authors = ["Piotrek Okoński"] - spec.email = ["piotrek@okonski.org"] + spec.authors = ["Piotrek Okoński", "Michał Krzyżanowski"] + spec.email = ["piotrek@okonski.org", "michal.krzyzanowski+github@gmail.com"] spec.summary = "Fast and distributed workflow runner based on ActiveJob and Redis" spec.description = "Gush is a parallel workflow runner using Redis as storage and ActiveJob for executing jobs." spec.homepage = "https://github.com/chaps-io/gush" From 3b47b5a694d08678199daa1abb9626fb39963903 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Krzy=C5=BCanowski?= Date: Wed, 28 Feb 2024 22:28:53 +0100 Subject: [PATCH 10/11] bump version --- lib/gush/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gush/version.rb b/lib/gush/version.rb index 352e909..89c896b 100644 --- a/lib/gush/version.rb +++ b/lib/gush/version.rb @@ -1,3 +1,3 @@ module Gush - VERSION = '2.1.0' + VERSION = '2.2.0' end From fdcae5960f57314da65dc67eb9a6ba047e68bf25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Krzy=C5=BCanowski?= Date: Thu, 29 Feb 2024 08:12:56 +0100 Subject: [PATCH 11/11] bump version to 3.0.0 --- lib/gush/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gush/version.rb b/lib/gush/version.rb index 89c896b..3982b0b 100644 --- a/lib/gush/version.rb +++ b/lib/gush/version.rb @@ -1,3 +1,3 @@ module Gush - VERSION = '2.2.0' + VERSION = '3.0.0' end