ci-queue 0.40.0 → 0.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be4adb99c549118b56b3b989e226acd24276f2105cd407ebe7c60685b439712f
-  data.tar.gz: 53ad2297734965e9eb942710e6c6e0dcff81b2597d864f1c0336cbf88c5b792d
+  metadata.gz: 23effff409f076f80b7af3728d46a4122a59ca1a5a4c3bd1de5162250d60e72f
+  data.tar.gz: ae3c402de5003a6acb3ad002305b85c092ae76d4850634892cab935e03d4479b
 SHA512:
-  metadata.gz: c5748d3f7cb1b9a9dd9cd386394c6e812f900fe7883686e920b8d2375fbb4fbfaf6c1a1a78703866f1bc3a64bf704cb21188c9fe3b1ddf762490aa1a36344770
-  data.tar.gz: d8d146b0427253a80d1ad3739d976bef95bf43fbee151b59fb3810d75450cfb3f3dbddd2a0825c9aea966b44d2c3226874fb182940a473e27873f526f2d7564b
+  metadata.gz: 0601ef053acbb457931feec6428c627cdc1ef3d8d3e76cdd54a98f02ef6f8f6f531a38be13dc3c40d2800ca0e9efe00c91c21a569470887978e8ba997880933a
+  data.tar.gz: c95d7058762b67a059c4868b1d69a8fd99d5f6098d70fa08d71ec7533f7674b8c0886d1090c41db0ba200273b0cbb1c5fbb0fc12ecadddab04f2fb6a9ec950f3

data/dev.yml

@@ -3,7 +3,7 @@
 name: ci-queue
 
 up:
-- ruby: 3.2.0
+- ruby: 3.3.0
 - bundler
 - redis
 

data/lib/ci/queue/redis/base.rb

@@ -13,12 +13,16 @@ module CI
 
         def initialize(redis_url, config)
           @redis_url = redis_url
-          @redis = ::Redis.new(
-            url: redis_url,
-            # Booting a CI worker is costly, so in case of a Redis blip,
-            # it makes sense to retry for a while before giving up.
-            reconnect_attempts: [0, 0, 0.1, 0.5, 1, 3, 5],
-          )
+          if ::Redis::VERSION > "5.0.0"
+            @redis = ::Redis.new(
+              url: redis_url,
+              # Booting a CI worker is costly, so in case of a Redis blip,
+              # it makes sense to retry for a while before giving up.
+              reconnect_attempts: [0, 0, 0.1, 0.5, 1, 3, 5],
+            )
+          else
+            @redis = ::Redis.new(url: redis_url)
+          end
           @config = config
         end
 

data/lib/ci/queue/redis.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-gem 'redis', '>= 5'
 require 'redis'
 require 'ci/queue/redis/build_record'
 require 'ci/queue/redis/base'

data/lib/ci/queue/version.rb

@@ -2,7 +2,7 @@
 
 module CI
   module Queue
-    VERSION = '0.40.0'
+    VERSION = '0.41.0'
     DEV_SCRIPTS_ROOT = ::File.expand_path('../../../../../redis', __FILE__)
     RELEASE_SCRIPTS_ROOT = ::File.expand_path('../redis', __FILE__)
   end

data/lib/minitest/queue/runner.rb

@@ -227,11 +227,11 @@ module Minitest
           end
 
           unless supervisor.exhausted?
+            reporter = BuildStatusReporter.new(build: supervisor.build)
+            reporter.report
             msg = "#{supervisor.size} tests weren't run."
             if supervisor.max_test_failed?
               puts('Encountered too many failed tests. Test run was ended early.')
-              reporter = BuildStatusReporter.new(build: supervisor.build)
-              reporter.report
               abort!(msg)
             else
               abort!(msg)
@@ -301,14 +301,9 @@ module Minitest
         return unless queue_config.warnings_file
 
         warnings = build.pop_warnings.map do |type, attributes|
-          case type
-          when CI::Queue::Warnings::RESERVED_LOST_TEST
-            "[WARNING] #{attributes[:test]} was picked up by another worker because it didn't complete in the allocated #{attributes[:timeout]} seconds.\n" \
-            "You may want to either optimize this test or bump ci-queue timeout.\n" \
-            "It's also possible that the worker that was processing it was terminated without being able to report back.\n"
-          end
+          attributes.merge(type: type)
         end.compact
-        File.write(queue_config.warnings_file, warnings.join("\n"))
+        File.write(queue_config.warnings_file, warnings.to_json)
       end
 
       def run_tests_in_fork(queue)

data/lib/minitest/queue.rb

@@ -244,20 +244,17 @@ module Minitest
           queue.report_success!
         end
 
-        requeued = false
         if failed && CI::Queue.requeueable?(result) && queue.requeue(example)
-          requeued = true
           result.requeue!
           reporter.record(result)
-        elsif queue.acknowledge(example) || !failed
+        elsif queue.acknowledge(example)
+          reporter.record(result)
+          queue.increment_test_failed if failed
+        elsif !failed
           # If the test was already acknowledged by another worker (we timed out)
           # Then we only record it if it is successful.
           reporter.record(result)
         end
-
-        if !requeued && failed
-          queue.increment_test_failed
-        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ci-queue
 version: !ruby/object:Gem::Version
-  version: 0.40.0
+  version: 0.41.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-21 00:00:00.000000000 Z
+date: 2024-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -239,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
+rubygems_version: 3.5.4
 signing_key: 
 specification_version: 4
 summary: Distribute tests over many workers using a queue