Skip to content

[NO-TICKET] Fix ci-queue dependency issue - add concurrent-ruby #405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anmarchenko merged 2 commits into from
Sep 26, 2025
Merged

[NO-TICKET] Fix ci-queue dependency issue - add concurrent-ruby #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5729bb5
[🤖] Update Latest Dependency: https://github.com/DataDog/datadog-ci-r…
dd-apm-ecosystems-autobot[bot] Sep 26, 2025
01f7658
fix ci-queue dependency issue
anmarchenko Sep 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Appraisals
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ def self.with_ci_queue_minitest_gem(minitest_versions: 5, ci_queue_versions: 0)
gem "minitest", "~> #{minitest_v}"
gem "ci-queue", "~> #{ci_queue_v}"
gem "minitest-reporters", "~> 1"
gem "concurrent-ruby"
end
end
end
Expand All @@ -94,6 +95,7 @@ def self.with_ci_queue_rspec_gem(rspec_versions: 3, ci_queue_versions: 0)
Array(rspec_versions).each do |rspec_v|
Array(ci_queue_versions).each do |ci_queue_v|
appraise "ci-queue-#{ci_queue_v}-rspec-#{rspec_v}" do
gem "concurrent-ruby"
gem "rspec", "~> #{rspec_v}"
gem "ci-queue", "~> #{ci_queue_v}"
end
Expand Down
1 change: 1 addition & 0 deletions gemfiles/jruby_9.4_ci_queue_0_minitest_5.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ gem "os"
gem "minitest", "~> 5"
gem "ci-queue", "~> 0"
gem "minitest-reporters", "~> 1"
gem "concurrent-ruby"

group :check do

Expand Down
2 changes: 2 additions & 0 deletions gemfiles/jruby_9.4_ci_queue_0_minitest_5.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ GEM
ci-queue (0.69.0)
logger
climate_control (1.2.0)
concurrent-ruby (1.3.5)
crack (1.0.0)
bigdecimal
rexml
Expand Down Expand Up @@ -97,6 +98,7 @@ DEPENDENCIES
appraisal
ci-queue (~> 0)
climate_control
concurrent-ruby
datadog!
datadog-ci!
minitest (~> 5)
Expand Down
1 change: 1 addition & 0 deletions gemfiles/jruby_9.4_ci_queue_0_rspec_3.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ gem "rake"
gem "yard"
gem "datadog", git: "https://github.com/DataDog/dd-trace-rb.git", branch: "master"
gem "os"
gem "concurrent-ruby"
gem "ci-queue", "~> 0"

group :check do
Expand Down
2 changes: 2 additions & 0 deletions gemfiles/jruby_9.4_ci_queue_0_rspec_3.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ GEM
ci-queue (0.69.0)
logger
climate_control (1.2.0)
concurrent-ruby (1.3.5)
crack (1.0.0)
bigdecimal
rexml
Expand Down Expand Up @@ -88,6 +89,7 @@ DEPENDENCIES
appraisal
ci-queue (~> 0)
climate_control
concurrent-ruby
datadog!
datadog-ci!
os
Expand Down
1 change: 1 addition & 0 deletions gemfiles/ruby_2.7_ci_queue_0_minitest_5.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ gem "os"
gem "minitest", "~> 5"
gem "ci-queue", "~> 0"
gem "minitest-reporters", "~> 1"
gem "concurrent-ruby"

group :check do

Expand Down
22 changes: 12 additions & 10 deletions gemfiles/ruby_2.7_ci_queue_0_minitest_5.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
GIT
remote: https://github.com/DataDog/dd-trace-rb.git
revision: 2aa94dd0d42bd118c4a5bcb872b7fa9ecd52b090
revision: ce02077b1a28ed224f095bea571b1c7228cc230a
branch: master
specs:
datadog (2.20.0)
datadog (2.22.0)
datadog-ruby_core_source (~> 3.4, >= 3.4.1)
libdatadog (~> 18.1.0.1.0)
libddwaf (~> 1.24.1.1.0)
libddwaf (~> 1.25.1.0.1)
logger
msgpack

Expand All @@ -28,12 +28,13 @@ GEM
bundler
rake
thor (>= 0.14.0)
bigdecimal (3.2.2)
bigdecimal (3.2.3)
builder (3.3.0)
cgi (0.5.0)
ci-queue (0.74.0)
ci-queue (0.78.0)
logger
climate_control (1.2.0)
concurrent-ruby (1.3.5)
crack (1.0.0)
bigdecimal
rexml
Expand All @@ -49,17 +50,17 @@ GEM
cgi (>= 0.3.3)
ffi (1.17.2-aarch64-linux-gnu)
ffi (1.17.2-x86_64-linux-gnu)
hashdiff (1.2.0)
hashdiff (1.2.1)
io-console (0.8.1)
irb (1.15.2)
pp (>= 0.6.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
libdatadog (18.1.0.1.0-aarch64-linux)
libdatadog (18.1.0.1.0-x86_64-linux)
libddwaf (1.24.1.1.0-aarch64-linux)
libddwaf (1.25.1.0.1-aarch64-linux)
ffi (~> 1.0)
libddwaf (1.24.1.1.0-x86_64-linux)
libddwaf (1.25.1.0.1-x86_64-linux)
ffi (~> 1.0)
logger (1.7.0)
minitest (5.25.5)
Expand All @@ -85,7 +86,7 @@ GEM
psych (>= 4.0.0)
reline (0.6.2)
io-console (~> 0.5)
rexml (3.4.1)
rexml (3.4.4)
rspec (3.13.1)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
Expand All @@ -100,7 +101,7 @@ GEM
rspec-mocks (3.13.5)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-support (3.13.5)
rspec-support (3.13.6)
rspec_junit_formatter (0.6.0)
rspec-core (>= 2, < 4, != 2.12.0)
ruby-progressbar (1.13.0)
Expand All @@ -126,6 +127,7 @@ DEPENDENCIES
appraisal
ci-queue (~> 0)
climate_control
concurrent-ruby
datadog!
datadog-ci!
debug
Expand Down
1 change: 1 addition & 0 deletions gemfiles/ruby_2.7_ci_queue_0_rspec_3.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ gem "rake"
gem "yard"
gem "datadog", git: "https://github.com/DataDog/dd-trace-rb.git", branch: "master"
gem "os"
gem "concurrent-ruby"
gem "ci-queue", "~> 0"

group :check do
Expand Down
24 changes: 13 additions & 11 deletions gemfiles/ruby_2.7_ci_queue_0_rspec_3.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
GIT
remote: https://github.com/DataDog/dd-trace-rb.git
revision: 2aa94dd0d42bd118c4a5bcb872b7fa9ecd52b090
revision: ce02077b1a28ed224f095bea571b1c7228cc230a
branch: master
specs:
datadog (2.20.0)
datadog (2.22.0)
datadog-ruby_core_source (~> 3.4, >= 3.4.1)
libdatadog (~> 18.1.0.1.0)
libddwaf (~> 1.24.1.1.0)
libddwaf (~> 1.25.1.0.1)
logger
msgpack

Expand All @@ -27,11 +27,12 @@ GEM
bundler
rake
thor (>= 0.14.0)
bigdecimal (3.2.2)
bigdecimal (3.2.3)
cgi (0.5.0)
ci-queue (0.74.0)
ci-queue (0.78.0)
logger
climate_control (1.2.0)
concurrent-ruby (1.3.5)
crack (1.0.0)
bigdecimal
rexml
Expand All @@ -47,17 +48,17 @@ GEM
cgi (>= 0.3.3)
ffi (1.17.2-aarch64-linux-gnu)
ffi (1.17.2-x86_64-linux-gnu)
hashdiff (1.2.0)
hashdiff (1.2.1)
io-console (0.8.1)
irb (1.15.2)
pp (>= 0.6.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
libdatadog (18.1.0.1.0-aarch64-linux)
libdatadog (18.1.0.1.0-x86_64-linux)
libddwaf (1.24.1.1.0-aarch64-linux)
libddwaf (1.25.1.0.1-aarch64-linux)
ffi (~> 1.0)
libddwaf (1.24.1.1.0-x86_64-linux)
libddwaf (1.25.1.0.1-x86_64-linux)
ffi (~> 1.0)
logger (1.7.0)
msgpack (1.8.0)
Expand All @@ -77,7 +78,7 @@ GEM
psych (>= 4.0.0)
reline (0.6.2)
io-console (~> 0.5)
rexml (3.4.1)
rexml (3.4.4)
rspec (3.13.1)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
Expand All @@ -92,7 +93,7 @@ GEM
rspec-mocks (3.13.5)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-support (3.13.5)
rspec-support (3.13.6)
rspec_junit_formatter (0.6.0)
rspec-core (>= 2, < 4, != 2.12.0)
simplecov (0.22.0)
Expand All @@ -117,6 +118,7 @@ DEPENDENCIES
appraisal
ci-queue (~> 0)
climate_control
concurrent-ruby
datadog!
datadog-ci!
debug
Expand All @@ -131,4 +133,4 @@ DEPENDENCIES
yard

BUNDLED WITH
2.3.26
2.4.22
20 changes: 10 additions & 10 deletions gemfiles/ruby_2.7_cucumber_3.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
GIT
remote: https://github.com/DataDog/dd-trace-rb.git
revision: 2aa94dd0d42bd118c4a5bcb872b7fa9ecd52b090
revision: ce02077b1a28ed224f095bea571b1c7228cc230a
branch: master
specs:
datadog (2.20.0)
datadog (2.22.0)
datadog-ruby_core_source (~> 3.4, >= 3.4.1)
libdatadog (~> 18.1.0.1.0)
libddwaf (~> 1.24.1.1.0)
libddwaf (~> 1.25.1.0.1)
logger
msgpack

Expand All @@ -28,7 +28,7 @@ GEM
rake
thor (>= 0.14.0)
backports (3.25.1)
bigdecimal (3.2.2)
bigdecimal (3.2.3)
builder (3.3.0)
cgi (0.5.0)
climate_control (1.2.0)
Expand Down Expand Up @@ -64,17 +64,17 @@ GEM
ffi (1.17.2-aarch64-linux-gnu)
ffi (1.17.2-x86_64-linux-gnu)
gherkin (5.1.0)
hashdiff (1.2.0)
hashdiff (1.2.1)
io-console (0.8.1)
irb (1.15.2)
pp (>= 0.6.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
libdatadog (18.1.0.1.0-aarch64-linux)
libdatadog (18.1.0.1.0-x86_64-linux)
libddwaf (1.24.1.1.0-aarch64-linux)
libddwaf (1.25.1.0.1-aarch64-linux)
ffi (~> 1.0)
libddwaf (1.24.1.1.0-x86_64-linux)
libddwaf (1.25.1.0.1-x86_64-linux)
ffi (~> 1.0)
logger (1.7.0)
msgpack (1.8.0)
Expand All @@ -96,7 +96,7 @@ GEM
psych (>= 4.0.0)
reline (0.6.2)
io-console (~> 0.5)
rexml (3.4.1)
rexml (3.4.4)
rspec (3.13.1)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
Expand All @@ -111,7 +111,7 @@ GEM
rspec-mocks (3.13.5)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-support (3.13.5)
rspec-support (3.13.6)
rspec_junit_formatter (0.6.0)
rspec-core (>= 2, < 4, != 2.12.0)
simplecov (0.22.0)
Expand Down Expand Up @@ -150,4 +150,4 @@ DEPENDENCIES
yard

BUNDLED WITH
2.3.26
2.4.22
24 changes: 13 additions & 11 deletions gemfiles/ruby_2.7_cucumber_4.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
GIT
remote: https://github.com/DataDog/dd-trace-rb.git
revision: 2aa94dd0d42bd118c4a5bcb872b7fa9ecd52b090
revision: ce02077b1a28ed224f095bea571b1c7228cc230a
branch: master
specs:
datadog (2.20.0)
datadog (2.22.0)
datadog-ruby_core_source (~> 3.4, >= 3.4.1)
libdatadog (~> 18.1.0.1.0)
libddwaf (~> 1.24.1.1.0)
libddwaf (~> 1.25.1.0.1)
logger
msgpack

Expand All @@ -32,7 +32,7 @@ GEM
bundler
rake
thor (>= 0.14.0)
bigdecimal (3.2.2)
bigdecimal (3.2.3)
builder (3.3.0)
cgi (0.5.0)
climate_control (1.2.0)
Expand Down Expand Up @@ -83,7 +83,7 @@ GEM
cgi (>= 0.3.3)
ffi (1.17.2-aarch64-linux-gnu)
ffi (1.17.2-x86_64-linux-gnu)
hashdiff (1.2.0)
hashdiff (1.2.1)
i18n (1.14.7)
concurrent-ruby (~> 1.0)
io-console (0.8.1)
Expand All @@ -93,11 +93,12 @@ GEM
reline (>= 0.4.2)
libdatadog (18.1.0.1.0-aarch64-linux)
libdatadog (18.1.0.1.0-x86_64-linux)
libddwaf (1.24.1.1.0-aarch64-linux)
libddwaf (1.25.1.0.1-aarch64-linux)
ffi (~> 1.0)
libddwaf (1.24.1.1.0-x86_64-linux)
libddwaf (1.25.1.0.1-x86_64-linux)
ffi (~> 1.0)
logger (1.7.0)
memoist3 (1.0.0)
middleware (0.1.0)
minitest (5.25.5)
msgpack (1.8.0)
Expand All @@ -123,7 +124,7 @@ GEM
psych (>= 4.0.0)
reline (0.6.2)
io-console (~> 0.5)
rexml (3.4.1)
rexml (3.4.4)
rspec (3.13.1)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
Expand All @@ -138,7 +139,7 @@ GEM
rspec-mocks (3.13.5)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-support (3.13.5)
rspec-support (3.13.6)
rspec_junit_formatter (0.6.0)
rspec-core (>= 2, < 4, != 2.12.0)
simplecov (0.22.0)
Expand All @@ -148,8 +149,9 @@ GEM
simplecov-html (0.13.2)
simplecov_json_formatter (0.1.4)
stringio (3.1.7)
sys-uname (1.3.1)
sys-uname (1.4.1)
ffi (~> 1.1)
memoist3 (~> 1.0.0)
thor (1.4.0)
thread_safe (0.3.6)
tzinfo (2.0.6)
Expand Down Expand Up @@ -183,4 +185,4 @@ DEPENDENCIES
yard

BUNDLED WITH
2.3.26
2.4.22
Loading
Loading