From b264fc1b03d9231747f06c961c2850aa4744623c Mon Sep 17 00:00:00 2001 From: Stefan Kaes Date: Mon, 5 Feb 2024 12:18:51 +0100 Subject: [PATCH 1/7] upgrade GitHub checkout action to v4 --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index b800146..42638e5 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -16,7 +16,7 @@ jobs: ruby-version: [3.2.2, 3.1.4, 3.0.6, 2.7.8] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Start containers run: docker-compose -f docker-compose.yml up -d From be3afcd8e009fae89982a624019ac0755bcc27b1 Mon Sep 17 00:00:00 2001 From: Stefan Kaes Date: Mon, 5 Feb 2024 12:19:57 +0100 Subject: [PATCH 2/7] test 3.3.0 and 3.2.3 --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 42638e5..2b9d018 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: - ruby-version: [3.2.2, 3.1.4, 3.0.6, 2.7.8] + ruby-version: [3.3.0, 3.2.3, 3.1.4, 3.0.6, 2.7.8] steps: - uses: actions/checkout@v4 From a40349d8c56a1da792de2d0f01ec26f1aaff5c0f Mon Sep 17 00:00:00 2001 From: Stefan Kaes Date: Mon, 5 Feb 2024 12:42:20 +0100 Subject: [PATCH 3/7] move development dependencies to Gemfile --- Gemfile | 14 ++++++++++++++ time_bandits.gemspec | 14 -------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Gemfile b/Gemfile index 6261dfa..5fc435f 100644 --- a/Gemfile +++ b/Gemfile @@ -3,4 +3,18 @@ source "https://rubygems.org" # Specify your gem's dependencies in time_bandits.gemspec gemspec +gem "ansi" +gem "appraisal" +gem "byebug" +gem "dalli" +gem "memcached", "~> 1.8.0" +gem "minitest" +gem "mocha" +gem "mysql2" +gem "rake" +gem "redis" +gem "sequel" +gem "activerecord" +gem "beetle", ">= 3.4.1" + gem "hiredis-client" diff --git a/time_bandits.gemspec b/time_bandits.gemspec index b133c9c..cce7a2f 100644 --- a/time_bandits.gemspec +++ b/time_bandits.gemspec @@ -23,19 +23,5 @@ Gem::Specification.new do |s| s.add_runtime_dependency("thread_variables") s.add_runtime_dependency("activesupport", [">= 5.2.0"]) - - s.add_development_dependency("ansi") - s.add_development_dependency("appraisal") - s.add_development_dependency("byebug") - s.add_development_dependency("dalli") - s.add_development_dependency("memcached", "~> 1.8.0") - s.add_development_dependency("minitest") - s.add_development_dependency("mocha") - s.add_development_dependency("mysql2") - s.add_development_dependency("rake") - s.add_development_dependency("redis") - s.add_development_dependency("sequel") - s.add_development_dependency("activerecord") - s.add_development_dependency("beetle", ">= 3.4.1") end From 11c04d794389ac7e8a2b100d988630c0582302af Mon Sep 17 00:00:00 2001 From: Stefan Kaes Date: Mon, 5 Feb 2024 12:47:21 +0100 Subject: [PATCH 4/7] skip memcached tests on ruby 3.3.0 as the gem does not compile --- Gemfile | 2 +- test/unit/memcached_test.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 5fc435f..5668e25 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ gem "ansi" gem "appraisal" gem "byebug" gem "dalli" -gem "memcached", "~> 1.8.0" +gem "memcached", "~> 1.8.0" if RUBY_VERSION < "3.3.0" gem "minitest" gem "mocha" gem "mysql2" diff --git a/test/unit/memcached_test.rb b/test/unit/memcached_test.rb index c02bf22..13e50bd 100644 --- a/test/unit/memcached_test.rb +++ b/test/unit/memcached_test.rb @@ -2,6 +2,7 @@ class MemcachedTest < Test::Unit::TestCase def setup + skip "memcached is currently not supported on Ruby #{RUBY_VERSION} as the gem does not compile" unless RUBY_VERSION < "3.3.0" TimeBandits.time_bandits = [] TimeBandits.add TimeBandits::TimeConsumers::Memcached TimeBandits.reset From a2da94a0448641d54084f7b8e1c507476c2a068f Mon Sep 17 00:00:00 2001 From: Stefan Kaes Date: Mon, 5 Feb 2024 12:49:03 +0100 Subject: [PATCH 5/7] drop Ruby 2.7.8 tests --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 2b9d018..6ab483e 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: - ruby-version: [3.3.0, 3.2.3, 3.1.4, 3.0.6, 2.7.8] + ruby-version: [3.3.0, 3.2.3, 3.1.4, 3.0.6] steps: - uses: actions/checkout@v4 From 4bbc3684d47a9ed4f884b72ff5de7a37e8a3097f Mon Sep 17 00:00:00 2001 From: Stefan Kaes Date: Mon, 5 Feb 2024 12:56:06 +0100 Subject: [PATCH 6/7] drop support for ruby 3 and rails 5 --- Appraisals | 2 -- 1 file changed, 2 deletions(-) diff --git a/Appraisals b/Appraisals index ac22d9f..093f853 100644 --- a/Appraisals +++ b/Appraisals @@ -6,8 +6,6 @@ appraisals = [ "7.1.1" ] -appraisals.insert(0, "5.2.8.1") if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.0.0") - appraisals.each do |rails_version| %w(4.0 5.0).each do |redis_version| appraise "activesupport-#{rails_version}-redis-#{redis_version}" do From 6509000fa545faf36ca8c10a69e696bdca02972d Mon Sep 17 00:00:00 2001 From: Stefan Kaes Date: Mon, 5 Feb 2024 12:56:33 +0100 Subject: [PATCH 7/7] test rails 7.1.8 --- Appraisals | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Appraisals b/Appraisals index 093f853..5c041f9 100644 --- a/Appraisals +++ b/Appraisals @@ -2,8 +2,7 @@ appraisals = [ "6.0.6.1", "6.1.7.6", "7.0.8", - "7.1.0", - "7.1.1" + "7.1.3" ] appraisals.each do |rails_version|