Skip to content

Commit 888edb5

Browse files
anmarchenkoanmarchenko
authored
Merge pull request #405 from DataDog/anmarchenko/fix_ci_queue_dep
[NO-TICKET] Fix ci-queue dependency issue - add concurrent-ruby
2 parents e5fafd0 + 01f7658 commit 888edb5

File tree

152 files changed

+2382
-2220
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+2382
-2220
lines changed

‎Appraisals‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ def self.with_ci_queue_minitest_gem(minitest_versions: 5, ci_queue_versions: 0)
8585
gem "minitest", "~> #{minitest_v}"
8686
gem "ci-queue", "~> #{ci_queue_v}"
8787
gem "minitest-reporters", "~> 1"
88+
gem "concurrent-ruby"
8889
end
8990
end
9091
end
@@ -94,6 +95,7 @@ def self.with_ci_queue_rspec_gem(rspec_versions: 3, ci_queue_versions: 0)
9495
Array(rspec_versions).each do |rspec_v|
9596
Array(ci_queue_versions).each do |ci_queue_v|
9697
appraise "ci-queue-#{ci_queue_v}-rspec-#{rspec_v}" do
98+
gem "concurrent-ruby"
9799
gem "rspec", "~> #{rspec_v}"
98100
gem "ci-queue", "~> #{ci_queue_v}"
99101
end

‎gemfiles/jruby_9.4_ci_queue_0_minitest_5.gemfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ gem "os"
1717
gem "minitest", "~> 5"
1818
gem "ci-queue", "~> 0"
1919
gem "minitest-reporters", "~> 1"
20+
gem "concurrent-ruby"
2021

2122
group :check do
2223

‎gemfiles/jruby_9.4_ci_queue_0_minitest_5.gemfile.lock‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ GEM
3333
ci-queue (0.69.0)
3434
logger
3535
climate_control (1.2.0)
36+
concurrent-ruby (1.3.5)
3637
crack (1.0.0)
3738
bigdecimal
3839
rexml
@@ -97,6 +98,7 @@ DEPENDENCIES
9798
appraisal
9899
ci-queue (~> 0)
99100
climate_control
101+
concurrent-ruby
100102
datadog!
101103
datadog-ci!
102104
minitest (~> 5)

‎gemfiles/jruby_9.4_ci_queue_0_rspec_3.gemfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ gem "rake"
1414
gem "yard"
1515
gem "datadog", git: "https://github.com/DataDog/dd-trace-rb.git", branch: "master"
1616
gem "os"
17+
gem "concurrent-ruby"
1718
gem "ci-queue", "~> 0"
1819

1920
group :check do

‎gemfiles/jruby_9.4_ci_queue_0_rspec_3.gemfile.lock‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ GEM
3131
ci-queue (0.69.0)
3232
logger
3333
climate_control (1.2.0)
34+
concurrent-ruby (1.3.5)
3435
crack (1.0.0)
3536
bigdecimal
3637
rexml
@@ -88,6 +89,7 @@ DEPENDENCIES
8889
appraisal
8990
ci-queue (~> 0)
9091
climate_control
92+
concurrent-ruby
9193
datadog!
9294
datadog-ci!
9395
os

‎gemfiles/ruby_2.7_ci_queue_0_minitest_5.gemfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ gem "os"
1818
gem "minitest", "~> 5"
1919
gem "ci-queue", "~> 0"
2020
gem "minitest-reporters", "~> 1"
21+
gem "concurrent-ruby"
2122

2223
group :check do
2324

‎gemfiles/ruby_2.7_ci_queue_0_minitest_5.gemfile.lock‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
GIT
22
remote: https://github.com/DataDog/dd-trace-rb.git
3-
revision: 2aa94dd0d42bd118c4a5bcb872b7fa9ecd52b090
3+
revision: ce02077b1a28ed224f095bea571b1c7228cc230a
44
branch: master
55
specs:
6-
datadog (2.20.0)
6+
datadog (2.22.0)
77
datadog-ruby_core_source (~> 3.4, >= 3.4.1)
88
libdatadog (~> 18.1.0.1.0)
9-
libddwaf (~> 1.24.1.1.0)
9+
libddwaf (~> 1.25.1.0.1)
1010
logger
1111
msgpack
1212

@@ -28,12 +28,13 @@ GEM
2828
bundler
2929
rake
3030
thor (>= 0.14.0)
31-
bigdecimal (3.2.2)
31+
bigdecimal (3.2.3)
3232
builder (3.3.0)
3333
cgi (0.5.0)
34-
ci-queue (0.74.0)
34+
ci-queue (0.78.0)
3535
logger
3636
climate_control (1.2.0)
37+
concurrent-ruby (1.3.5)
3738
crack (1.0.0)
3839
bigdecimal
3940
rexml
@@ -49,17 +50,17 @@ GEM
4950
cgi (>= 0.3.3)
5051
ffi (1.17.2-aarch64-linux-gnu)
5152
ffi (1.17.2-x86_64-linux-gnu)
52-
hashdiff (1.2.0)
53+
hashdiff (1.2.1)
5354
io-console (0.8.1)
5455
irb (1.15.2)
5556
pp (>= 0.6.0)
5657
rdoc (>= 4.0.0)
5758
reline (>= 0.4.2)
5859
libdatadog (18.1.0.1.0-aarch64-linux)
5960
libdatadog (18.1.0.1.0-x86_64-linux)
60-
libddwaf (1.24.1.1.0-aarch64-linux)
61+
libddwaf (1.25.1.0.1-aarch64-linux)
6162
ffi (~> 1.0)
62-
libddwaf (1.24.1.1.0-x86_64-linux)
63+
libddwaf (1.25.1.0.1-x86_64-linux)
6364
ffi (~> 1.0)
6465
logger (1.7.0)
6566
minitest (5.25.5)
@@ -85,7 +86,7 @@ GEM
8586
psych (>= 4.0.0)
8687
reline (0.6.2)
8788
io-console (~> 0.5)
88-
rexml (3.4.1)
89+
rexml (3.4.4)
8990
rspec (3.13.1)
9091
rspec-core (~> 3.13.0)
9192
rspec-expectations (~> 3.13.0)
@@ -100,7 +101,7 @@ GEM
100101
rspec-mocks (3.13.5)
101102
diff-lcs (>= 1.2.0, < 2.0)
102103
rspec-support (~> 3.13.0)
103-
rspec-support (3.13.5)
104+
rspec-support (3.13.6)
104105
rspec_junit_formatter (0.6.0)
105106
rspec-core (>= 2, < 4, != 2.12.0)
106107
ruby-progressbar (1.13.0)
@@ -126,6 +127,7 @@ DEPENDENCIES
126127
appraisal
127128
ci-queue (~> 0)
128129
climate_control
130+
concurrent-ruby
129131
datadog!
130132
datadog-ci!
131133
debug

‎gemfiles/ruby_2.7_ci_queue_0_rspec_3.gemfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ gem "rake"
1515
gem "yard"
1616
gem "datadog", git: "https://github.com/DataDog/dd-trace-rb.git", branch: "master"
1717
gem "os"
18+
gem "concurrent-ruby"
1819
gem "ci-queue", "~> 0"
1920

2021
group :check do

‎gemfiles/ruby_2.7_ci_queue_0_rspec_3.gemfile.lock‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
GIT
22
remote: https://github.com/DataDog/dd-trace-rb.git
3-
revision: 2aa94dd0d42bd118c4a5bcb872b7fa9ecd52b090
3+
revision: ce02077b1a28ed224f095bea571b1c7228cc230a
44
branch: master
55
specs:
6-
datadog (2.20.0)
6+
datadog (2.22.0)
77
datadog-ruby_core_source (~> 3.4, >= 3.4.1)
88
libdatadog (~> 18.1.0.1.0)
9-
libddwaf (~> 1.24.1.1.0)
9+
libddwaf (~> 1.25.1.0.1)
1010
logger
1111
msgpack
1212

@@ -27,11 +27,12 @@ GEM
2727
bundler
2828
rake
2929
thor (>= 0.14.0)
30-
bigdecimal (3.2.2)
30+
bigdecimal (3.2.3)
3131
cgi (0.5.0)
32-
ci-queue (0.74.0)
32+
ci-queue (0.78.0)
3333
logger
3434
climate_control (1.2.0)
35+
concurrent-ruby (1.3.5)
3536
crack (1.0.0)
3637
bigdecimal
3738
rexml
@@ -47,17 +48,17 @@ GEM
4748
cgi (>= 0.3.3)
4849
ffi (1.17.2-aarch64-linux-gnu)
4950
ffi (1.17.2-x86_64-linux-gnu)
50-
hashdiff (1.2.0)
51+
hashdiff (1.2.1)
5152
io-console (0.8.1)
5253
irb (1.15.2)
5354
pp (>= 0.6.0)
5455
rdoc (>= 4.0.0)
5556
reline (>= 0.4.2)
5657
libdatadog (18.1.0.1.0-aarch64-linux)
5758
libdatadog (18.1.0.1.0-x86_64-linux)
58-
libddwaf (1.24.1.1.0-aarch64-linux)
59+
libddwaf (1.25.1.0.1-aarch64-linux)
5960
ffi (~> 1.0)
60-
libddwaf (1.24.1.1.0-x86_64-linux)
61+
libddwaf (1.25.1.0.1-x86_64-linux)
6162
ffi (~> 1.0)
6263
logger (1.7.0)
6364
msgpack (1.8.0)
@@ -77,7 +78,7 @@ GEM
7778
psych (>= 4.0.0)
7879
reline (0.6.2)
7980
io-console (~> 0.5)
80-
rexml (3.4.1)
81+
rexml (3.4.4)
8182
rspec (3.13.1)
8283
rspec-core (~> 3.13.0)
8384
rspec-expectations (~> 3.13.0)
@@ -92,7 +93,7 @@ GEM
9293
rspec-mocks (3.13.5)
9394
diff-lcs (>= 1.2.0, < 2.0)
9495
rspec-support (~> 3.13.0)
95-
rspec-support (3.13.5)
96+
rspec-support (3.13.6)
9697
rspec_junit_formatter (0.6.0)
9798
rspec-core (>= 2, < 4, != 2.12.0)
9899
simplecov (0.22.0)
@@ -117,6 +118,7 @@ DEPENDENCIES
117118
appraisal
118119
ci-queue (~> 0)
119120
climate_control
121+
concurrent-ruby
120122
datadog!
121123
datadog-ci!
122124
debug
@@ -131,4 +133,4 @@ DEPENDENCIES
131133
yard
132134

133135
BUNDLED WITH
134-
2.3.26
136+
2.4.22

‎gemfiles/ruby_2.7_cucumber_3.gemfile.lock‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
GIT
22
remote: https://github.com/DataDog/dd-trace-rb.git
3-
revision: 2aa94dd0d42bd118c4a5bcb872b7fa9ecd52b090
3+
revision: ce02077b1a28ed224f095bea571b1c7228cc230a
44
branch: master
55
specs:
6-
datadog (2.20.0)
6+
datadog (2.22.0)
77
datadog-ruby_core_source (~> 3.4, >= 3.4.1)
88
libdatadog (~> 18.1.0.1.0)
9-
libddwaf (~> 1.24.1.1.0)
9+
libddwaf (~> 1.25.1.0.1)
1010
logger
1111
msgpack
1212

@@ -28,7 +28,7 @@ GEM
2828
rake
2929
thor (>= 0.14.0)
3030
backports (3.25.1)
31-
bigdecimal (3.2.2)
31+
bigdecimal (3.2.3)
3232
builder (3.3.0)
3333
cgi (0.5.0)
3434
climate_control (1.2.0)
@@ -64,17 +64,17 @@ GEM
6464
ffi (1.17.2-aarch64-linux-gnu)
6565
ffi (1.17.2-x86_64-linux-gnu)
6666
gherkin (5.1.0)
67-
hashdiff (1.2.0)
67+
hashdiff (1.2.1)
6868
io-console (0.8.1)
6969
irb (1.15.2)
7070
pp (>= 0.6.0)
7171
rdoc (>= 4.0.0)
7272
reline (>= 0.4.2)
7373
libdatadog (18.1.0.1.0-aarch64-linux)
7474
libdatadog (18.1.0.1.0-x86_64-linux)
75-
libddwaf (1.24.1.1.0-aarch64-linux)
75+
libddwaf (1.25.1.0.1-aarch64-linux)
7676
ffi (~> 1.0)
77-
libddwaf (1.24.1.1.0-x86_64-linux)
77+
libddwaf (1.25.1.0.1-x86_64-linux)
7878
ffi (~> 1.0)
7979
logger (1.7.0)
8080
msgpack (1.8.0)
@@ -96,7 +96,7 @@ GEM
9696
psych (>= 4.0.0)
9797
reline (0.6.2)
9898
io-console (~> 0.5)
99-
rexml (3.4.1)
99+
rexml (3.4.4)
100100
rspec (3.13.1)
101101
rspec-core (~> 3.13.0)
102102
rspec-expectations (~> 3.13.0)
@@ -111,7 +111,7 @@ GEM
111111
rspec-mocks (3.13.5)
112112
diff-lcs (>= 1.2.0, < 2.0)
113113
rspec-support (~> 3.13.0)
114-
rspec-support (3.13.5)
114+
rspec-support (3.13.6)
115115
rspec_junit_formatter (0.6.0)
116116
rspec-core (>= 2, < 4, != 2.12.0)
117117
simplecov (0.22.0)
@@ -150,4 +150,4 @@ DEPENDENCIES
150150
yard
151151

152152
BUNDLED WITH
153-
2.3.26
153+
2.4.22

0 commit comments

Comments
 (0)